[Scummvm-cvs-logs] CVS: scummvm Makefile,1.26,1.27 akos.cpp,1.9,1.10 boxes.cpp,1.20,1.21 gfx.cpp,1.57,1.58 gui.cpp,1.22,1.23 object.cpp,1.47,1.48 resource.cpp,1.58,1.59 script_v1.cpp,1.56,1.57 sdl.cpp,1.56,1.57 string.cpp,1.34,1.35
Vincent Hamm
yazoo at users.sourceforge.net
Sun Mar 24 09:50:09 CET 2002
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv9495
Modified Files:
Makefile akos.cpp boxes.cpp gfx.cpp gui.cpp object.cpp
resource.cpp script_v1.cpp sdl.cpp string.cpp
Log Message:
Fixed pal init
Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** Makefile 24 Mar 2002 00:27:00 -0000 1.26
--- Makefile 24 Mar 2002 17:49:46 -0000 1.27
***************
*** 2,6 ****
CC = gcc
! CFLAGS = -g -Wall -Wstrict-prototypes -Wno-long-long -Wno-multichar
DEFINES = -DUNIX -DUSE_ADLIB
LDFLAGS :=
--- 2,6 ----
CC = gcc
! CFLAGS = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar
DEFINES = -DUNIX -DUSE_ADLIB
LDFLAGS :=
Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/akos.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** akos.cpp 20 Mar 2002 17:51:06 -0000 1.9
--- akos.cpp 24 Mar 2002 17:49:46 -0000 1.10
***************
*** 553,557 ****
bool use_scaling;
int i,j;
! int x,x_right,x_left,skip,tmp_x,tmp_y;
int y,y_top,y_bottom;
bool y_clipping;
--- 553,557 ----
bool use_scaling;
int i,j;
! int x,x_right,x_left,skip=0,tmp_x,tmp_y;
int y,y_top,y_bottom;
bool y_clipping;
Index: boxes.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/boxes.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** boxes.cpp 20 Mar 2002 17:51:06 -0000 1.20
--- boxes.cpp 24 Mar 2002 17:49:46 -0000 1.21
***************
*** 509,513 ****
PathVertex *vtx;
! PathNode *node, *node2;
_maxBoxVertexHeap = 1000;
--- 509,513 ----
PathVertex *vtx;
! PathNode *node, *node2=NULL;
_maxBoxVertexHeap = 1000;
***************
*** 862,866 ****
void Scumm::GetGates(int trap1,int trap2) {
int i;
! int Closest1,Closest2,Closest3;
int Dist[8];
int Dist1,Dist2,Dist3;
--- 862,866 ----
void Scumm::GetGates(int trap1,int trap2) {
int i;
! int Closest1=0,Closest2=0,Closest3=0;
int Dist[8];
int Dist1,Dist2,Dist3;
Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gfx.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** gfx.cpp 24 Mar 2002 16:35:17 -0000 1.57
--- gfx.cpp 24 Mar 2002 17:49:46 -0000 1.58
***************
*** 1306,1310 ****
unsigned char c, bits, color, run;
int x, y, i, z;
! uint buffer, mask = 128;
int h = _numLinesToProcess;
x = y = i = z = run = 0;
--- 1306,1310 ----
unsigned char c, bits, color, run;
int x, y, i, z;
! uint buffer=0, mask = 128;
int h = _numLinesToProcess;
x = y = i = z = run = 0;
***************
*** 1375,1379 ****
byte *dst = _bgbak_ptr;
int bits, i;
! uint buffer, mask = 128;
unsigned char inc = 1, color = *src++;
--- 1375,1379 ----
byte *dst = _bgbak_ptr;
int bits, i;
! uint buffer=0, mask = 128;
unsigned char inc = 1, color = *src++;
***************
*** 1696,1700 ****
CameraData *cd = &camera;
ScummPoint old = cd->_cur;
! Actor *a;
if (cd->_follows) {
--- 1696,1700 ----
CameraData *cd = &camera;
ScummPoint old = cd->_cur;
! Actor *a=NULL;
if (cd->_follows) {
***************
*** 1779,1783 ****
int pos = cd->_cur.x;
int actorx, t;
! Actor *a;
cd->_cur.x &= 0xFFF8;
--- 1779,1783 ----
int pos = cd->_cur.x;
int actorx, t;
! Actor *a=NULL;
cd->_cur.x &= 0xFFF8;
***************
*** 2310,2314 ****
int i;
int ar,ag,ab;
! uint sum,j,bestsum,bestitem;
byte *pal = _currentPalette;
--- 2310,2314 ----
int i;
int ar,ag,ab;
! uint sum,j,bestsum,bestitem=0;
byte *pal = _currentPalette;
Index: gui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** gui.cpp 21 Mar 2002 16:12:01 -0000 1.22
--- gui.cpp 24 Mar 2002 17:49:46 -0000 1.23
***************
*** 97,101 ****
void Gui::drawChar(const char str, int xx, int yy) {
! unsigned int buffer, mask = 0, x, y;
byte *tmp;
int tempc = _color;
--- 97,101 ----
void Gui::drawChar(const char str, int xx, int yy) {
! unsigned int buffer=0, mask = 0, x, y;
byte *tmp;
int tempc = _color;
Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/object.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** object.cpp 23 Mar 2002 20:34:45 -0000 1.47
--- object.cpp 24 Mar 2002 17:49:46 -0000 1.48
***************
*** 671,675 ****
if(_features & GF_SMALL_HEADER) {
! byte offset;
objptr = getOBCDFromObject(obj);
--- 671,675 ----
if(_features & GF_SMALL_HEADER) {
! byte offset=0;
objptr = getOBCDFromObject(obj);
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/resource.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** resource.cpp 23 Mar 2002 22:03:35 -0000 1.58
--- resource.cpp 24 Mar 2002 17:49:46 -0000 1.59
***************
*** 658,662 ****
uint32 pos, total_size, size, tag,basetag;
int pri, best_pri;
! uint32 best_size, best_offs;
debug(9, "readSoundResource(%d,%d)", type, idx);
--- 658,662 ----
uint32 pos, total_size, size, tag,basetag;
int pri, best_pri;
! uint32 best_size=0, best_offs=0;
debug(9, "readSoundResource(%d,%d)", type, idx);
Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** script_v1.cpp 20 Mar 2002 17:51:06 -0000 1.56
--- script_v1.cpp 24 Mar 2002 17:49:46 -0000 1.57
***************
*** 1656,1660 ****
void Scumm::o5_resourceRoutines() {
! int resid;
_opcode = fetchScriptByte();
--- 1656,1660 ----
void Scumm::o5_resourceRoutines() {
! int resid=0;
_opcode = fetchScriptByte();
***************
*** 1743,1747 ****
void Scumm::o5_roomOps() {
! int a,b,c,d,e;
if(_features & GF_OLD256)
--- 1743,1747 ----
void Scumm::o5_roomOps() {
! int a=0,b=0,c,d,e;
if(_features & GF_OLD256)
Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sdl.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** sdl.cpp 24 Mar 2002 17:02:31 -0000 1.56
--- sdl.cpp 24 Mar 2002 17:49:46 -0000 1.57
***************
*** 980,985 ****
scumm->_verbMouseOver=0;
! scumm->_palDirtyMax=-1;
! scumm->_palDirtyMin=-1;
scumm->_debugger=0;
scumm->camera._cur.x=0;
--- 980,985 ----
scumm->_verbMouseOver=0;
! scumm->_palDirtyMax=0;
! scumm->_palDirtyMin=0;
scumm->_debugger=0;
scumm->camera._cur.x=0;
Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/string.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** string.cpp 20 Mar 2002 22:58:41 -0000 1.34
--- string.cpp 24 Mar 2002 17:49:47 -0000 1.35
***************
*** 428,432 ****
byte *charsetptr,*space;
int i;
! byte byte1, chr;
uint color;
--- 428,432 ----
byte *charsetptr,*space;
int i;
! byte byte1=0, chr;
uint color;
***************
*** 702,706 ****
VirtScreen *vs;
byte *char_ptr, *dest_ptr;
! unsigned int buffer, mask=0, x = 0, y = 0;
unsigned char color;
--- 702,706 ----
VirtScreen *vs;
byte *char_ptr, *dest_ptr;
! unsigned int buffer=0, mask=0, x = 0, y = 0;
unsigned char color;
More information about the Scummvm-git-logs
mailing list