cromer
/
qt-agistudio
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Compare commits

base: cromer:master
Branches Tags
cromer:master
cromer:1.3.2
cromer:1.3.1
..
compare: cromer:1.3.1
Branches Tags
cromer:master
cromer:1.3.2
cromer:1.3.1

No commits in common. "master" and "1.3.1" have entirely different histories.
master ... 1.3.1

12 changed files with 22 additions and 45 deletions
Show Stats Expand all files Collapse all files

2
README
View File

@ -1,4 +1,4 @@
QT AGI Studio, release 1.3.2
QT AGI Studio, release 1.3.1
About
=====

2
agistudio.1
View File

@ -1,5 +1,5 @@
.\" Hey, EMACS: -*- nroff -*-
.TH AGISTUDIO 1 "May 1, 2019" "agistudio" "QT AGI Studio 1.3.2"
.TH AGISTUDIO 1 "May 1, 2019" "agistudio" "QT AGI Studio 1.3.1"
.SH NAME
QT AGI Studio \- an AGI adventure game development environment
.SH SYNOPSIS

2
help/todo.html
View File

@ -2,7 +2,7 @@
<HEAD>
<TITLE>TODO list</TITLE></HEAD>
<BODY>
<h1>TODO (QT AGI Studio v1.3.2)</h1>
<h1>TODO (QT AGI Studio v1.3.1)</h1>
<i>This is not a development plan but rather an unsorted list of ideas. You are welcome to contribute. :-)</i>

6
packaging/debian/changelog
View File

@ -1,9 +1,3 @@
agistudio (1.3.2-1) unstable; urgency=low
* New upstream release.
-- Chris Cromer <chris@cromer.cl> Sun, 19 Apr 2020 15:12:00 +0300
agistudio (1.3.1-1) unstable; urgency=low
* New upstream release.

4
packaging/rpm/agistudio.spec
View File

@ -1,10 +1,10 @@
Summary: AGI integrated development environment
Name: agistudio
Version: 1.3.2
Version: 1.3.1
Release: 0
Copyright: GPL
Group: Development/Tools
Source: agistudio-1.3.2.tar.gz
Source: agistudio-1.3.1.tar.gz
URL: http://agistudio.sourceforge.net/
%description
AGI (Adventure Game Interpreter) is the adventure game engine used by

7
relnotes
View File

@ -1,10 +1,3 @@
Release notes for QT AGI Studio version 1.3.2 (2020-04-19)
- fixes
* fixed view editor fill not updating the canvas
* fixed pic edit not updating the canvas
* add some win32 fixes
Release notes for QT AGI Studio version 1.3.1 (2019-05-09)
- fixes

1
src/agistudio.pro
View File

@ -1,7 +1,6 @@
TEMPLATE = app
CONFIG = qt warn_on release thread
#CONFIG = qt warn_on debug thread
#CONFIG += static # win32 static linking
# DEFINES += QT_DLL QT_THREAD_SUPPORT # win32
QMAKE_CXXFLAGS += -Wno-unused-result
HEADERS = agicommands.h \

8
src/game.cpp
View File

@ -302,8 +302,8 @@ int Game::from_template(string name)
struct _finddata_t c_file;
long hFile;
if ((hFile = _findfirst(tmp, &c_file)) != -1L) do {
sprintf(tmp,"%s/%s",templatedir.c_str(),c_file.name);
cfilename = tmp;
sprintf(tmp2,"%s/%s",templatedir.c_str(),c_file.name);
cfilename = tmp2;
#else
glob_t globbuf;
glob(tmp, 0, NULL, &globbuf);
@ -335,8 +335,8 @@ int Game::from_template(string name)
sprintf(tmp,"%s/src/*",templatedir.c_str());
#ifdef _WIN32
if ((hFile = _findfirst(tmp, &c_file)) != -1L) do {
sprintf(tmp,"%s/src/%s",templatedir.c_str(),c_file.name);
cfilename = tmp;
sprintf(tmp2,"%s/src/%s",templatedir.c_str(),c_file.name);
cfilename = tmp2;
#else
glob(tmp, 0, NULL, &globbuf);
for(i=0;i<(int)globbuf.gl_pathc;i++){ //copy template src subdirectory

2
src/menu.cpp
View File

@ -889,7 +889,7 @@ About::About(QWidget *parent, const char *name )
about->setTextFormat(Qt::RichText);
about->setReadOnly(true);
about->setText(
"<center><b>QT AGI studio v. 1.3.2</b><br>"
"<center><b>QT AGI studio v. 1.3.1</b><br>"
"http://agistudio.sourceforge.net/<br>"
"<br>"
"<b>Authors:</b><br>"

30
src/picedit.cpp
View File

@ -606,7 +606,6 @@ void PicEdit::zoom_minus()
h = canvas->cur_h+4;
canvas->resizeContents(w,h);
}
canvas->update();
}
@ -621,7 +620,6 @@ void PicEdit::zoom_plus()
h = canvas->cur_h+4;
canvas->resizeContents(w,h);
}
canvas->update();
}
@ -904,7 +902,7 @@ void PCanvas::setPixsize(int s)
pixmap.resize(cur_w,cur_h);
QPainter p(&pixmap);
p.eraseRect(0,0,cur_w,cur_h);
updatePainter(&p);
update();
}
//*********************************************
@ -986,17 +984,11 @@ void PCanvas::drawContents(QPainter* p,int ,int ,int ,int )
}
//*********************************************
void PCanvas::update()
{
QPainter p(&pixmap);
updatePainter(&p);
}
//*********************************************
void PCanvas::updatePainter(QPainter *p)
{
//QPainter p(&pixmap);
int x,y;
byte c;
byte *data;
@ -1008,11 +1000,11 @@ void PCanvas::updatePainter(QPainter *p)
for(x=0;x<MAX_W;x+=2){
c=data[y*MAX_W+x];
if((pic&&c==15)||(!pic&&c==4)){ //draw background instead of "empty" areas
p->fillRect(x*pixsize,y*pixsize,pixsize,pixsize,QColor(bgpix.pixel(x,y)));
p->fillRect((x+1)*pixsize,y*pixsize,pixsize,pixsize,QColor(bgpix.pixel(x+1,y)));
p.fillRect(x*pixsize,y*pixsize,pixsize,pixsize,QColor(bgpix.pixel(x,y)));
p.fillRect((x+1)*pixsize,y*pixsize,pixsize,pixsize,QColor(bgpix.pixel(x+1,y)));
}
else{
p->fillRect(x*pixsize,y*pixsize,pixsize*2,pixsize,egacolor[c]);
p.fillRect(x*pixsize,y*pixsize,pixsize*2,pixsize,egacolor[c]);
}
}
}
@ -1020,7 +1012,7 @@ void PCanvas::updatePainter(QPainter *p)
else{
for(y=0;y<MAX_HH;y++){
for(x=0;x<MAX_W;x+=2){
p->fillRect(x*pixsize,y*pixsize,pixsize*2,pixsize,egacolor[data[y*MAX_W+x]]);
p.fillRect(x*pixsize,y*pixsize,pixsize*2,pixsize,egacolor[data[y*MAX_W+x]]);
}
}
}
@ -1038,11 +1030,11 @@ void PCanvas::updatePainter(QPainter *p)
for(y=step*3;y<MAX_HH*pixsize;y+=step){
//pen.setBrush(QColor(255, 0, 0, 127));
pen.setBrush(egacolor[i++]);
p->setPen(pen);
p->drawLine(0,y,MAX_W*pixsize,y);
p.setPen(pen);
p.drawLine(0,y,MAX_W*pixsize,y);
pen.setBrush(QColor(0, 0, 0, 127));
p->setPen(pen);
p->drawLine(0,y+1,MAX_W*pixsize,y+1);
p.setPen(pen);
p.drawLine(0,y+1,MAX_W*pixsize,y+1);
}
}

1
src/picedit.h
View File

@ -80,7 +80,6 @@ public:
void load_bg(char *filename);
void draw(int ResNum);
void update();
void updatePainter(QPainter *p);
void setSize(int w,int h);
void setPixsize(int pixsize);
protected:

2
src/viewedit.cpp
View File

@ -1838,8 +1838,8 @@ void Canvas::UpdateCel(int x,int y){
if(xn>=0&&xn<cur_w && yn>=0&&yn<cur_h){
QPainter p(&pixmap);
if(viewedit->drawing_mode == V_DRAW){
QPainter p(&pixmap);
x=xn*2*pixsize;
y=yn*pixsize;