[Scummvm-cvs-logs] CVS: scummvm akos.cpp,1.5,1.6 debug.cpp,1.14,1.15 gfx.cpp,1.35,1.36 gui.cpp,1.7,1.8 object.cpp,1.26,1.27 resource.cpp,1.40,1.41 saveload.cpp,1.25,1.26 script.cpp,1.21,1.22 script_v1.cpp,1.36,1.37 script_v2.cpp,1.20,1.21 scummvm.cpp,1.46,1.47 sdl.cpp,1.34,1.35 sound.cpp,1.17,1.18 string.cpp,1.24,1.25 verbs.cpp,1.17,1.18
James Brown
ender at users.sourceforge.net
Sun Feb 24 09:26:02 CET 2002
- Previous message: [Scummvm-cvs-logs] CVS: scummvm scummsys.h,1.18,1.19 scummvm.dsp,1.18,1.19
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sound adlib.cpp,1.4,1.5 fmopl.cpp,1.1,1.2 imuse.cpp,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv31946
Modified Files:
akos.cpp debug.cpp gfx.cpp gui.cpp object.cpp resource.cpp
saveload.cpp script.cpp script_v1.cpp script_v2.cpp
scummvm.cpp sdl.cpp sound.cpp string.cpp verbs.cpp
Log Message:
Code cleanup - get rid of a bunch of typecast and unused variable warnings.
Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/akos.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** akos.cpp 2 Feb 2002 19:07:10 -0000 1.5
--- akos.cpp 24 Feb 2002 17:25:02 -0000 1.6
***************
*** 52,56 ****
int i;
byte code;
! uint32 start,len;
uint16 mask;
--- 52,56 ----
int i;
byte code;
! uint16 start,len;
uint16 mask;
***************
*** 121,125 ****
void Scumm::akos_setPalette(AkosRenderer *ar, byte *palette) {
! byte *akos, *akpl;
uint size, i;
--- 121,125 ----
void Scumm::akos_setPalette(AkosRenderer *ar, byte *palette) {
! byte *akpl;
uint size, i;
***************
*** 295,302 ****
void akos_generic_decode(AkosRenderer *ar) {
byte *src,*dst;
! byte len,height,pcolor, maskbit;
! uint y,scrheight;
! uint color;
! int t;
const byte *scaleytab, *mask;
--- 295,300 ----
void akos_generic_decode(AkosRenderer *ar) {
byte *src,*dst;
! byte len,height, maskbit;
! uint y, color;
const byte *scaleytab, *mask;
***************
*** 359,365 ****
byte *src,*dst;
byte len,height,pcolor, maskbit;
! uint y,scrheight;
! uint color;
! int t;
const byte *scaleytab, *mask;
--- 357,361 ----
byte *src,*dst;
byte len,height,pcolor, maskbit;
! uint y, color;
const byte *scaleytab, *mask;
***************
*** 529,533 ****
int x,x_right,x_left,skip,tmp_x,tmp_y;
int y,y_top,y_bottom;
- byte *stab;
bool y_clipping;
bool charsetmask;
--- 525,528 ----
Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/debug.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** debug.cpp 23 Feb 2002 23:23:28 -0000 1.14
--- debug.cpp 24 Feb 2002 17:25:02 -0000 1.15
***************
*** 61,66 ****
void BoxTest(int num);
bool ScummDebugger::do_command() {
- int cmd;
-
switch(get_command()) {
case CMD_HELP:
--- 61,64 ----
***************
*** 122,127 ****
case CMD_EXIT:
exit(1);
}
- /* this line is never reached */
}
--- 120,127 ----
case CMD_EXIT:
exit(1);
+
+ default: /* this line is never reached */
+ error("Unknown debug command");
}
}
Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gfx.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** gfx.cpp 19 Feb 2002 22:36:09 -0000 1.35
--- gfx.cpp 24 Feb 2002 17:25:02 -0000 1.36
***************
*** 359,363 ****
void Scumm::setPaletteFromPtr(byte *ptr) {
int i, r, g, b;
! byte *dest, *epal;
int numcolor;
--- 359,363 ----
void Scumm::setPaletteFromPtr(byte *ptr) {
int i, r, g, b;
! byte *dest;
int numcolor;
***************
*** 407,411 ****
void Scumm::initCycl(byte *ptr) {
! int i, j;
ColorCycle *cycl;
--- 407,411 ----
void Scumm::initCycl(byte *ptr) {
! int j;
ColorCycle *cycl;
***************
*** 561,565 ****
int val;
CameraData *cd = &camera;
! int diff;
#if !defined(FULL_THROTTLE)
--- 561,565 ----
int val;
CameraData *cd = &camera;
! int diff; // Full throttle hack
#if !defined(FULL_THROTTLE)
***************
*** 1261,1265 ****
byte *src = _smap_ptr;
byte *dst = _bgbak_ptr;
- int i;
uint h = _numLinesToProcess;
--- 1261,1264 ----
***************
*** 1584,1588 ****
int i,j;
int bottom;
- int *tab2_ptr;
int l,t,r,b;
--- 1583,1586 ----
***************
*** 1989,1993 ****
int i;
uint32 onlyActorFlags,bitpos;
- int offs;
for(i=0; i<40; i++) {
--- 1987,1990 ----
***************
*** 2392,2396 ****
do {
! byte color,code;
uint len, num;
uint x;
--- 2389,2393 ----
do {
! byte color;
uint len, num;
uint x;
Index: gui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** gui.cpp 23 Jan 2002 17:27:26 -0000 1.7
--- gui.cpp 24 Feb 2002 17:25:02 -0000 1.8
***************
*** 116,121 ****
void Gui::widgetClear(const GuiWidget *wid) {
! int x,y,w,h;
! int i,j;
x = wid->_x;
--- 116,120 ----
void Gui::widgetClear(const GuiWidget *wid) {
! int x,y,w,h,i;
x = wid->_x;
***************
*** 146,150 ****
int x = w->_x, y = w->_y;
int x2 = x + w->_w-1, y2 = y + w->_h-1;
- int i;
byte tmp;
--- 145,148 ----
***************
*** 495,499 ****
leftMouseClick(_s->mouse.x, _s->mouse.y);
} else if (_s->_lastKeyHit) {
! addLetter(_s->_lastKeyHit);
}
--- 493,497 ----
leftMouseClick(_s->mouse.x, _s->mouse.y);
} else if (_s->_lastKeyHit) {
! addLetter((unsigned char)_s->_lastKeyHit);
}
Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/object.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** object.cpp 15 Feb 2002 21:17:42 -0000 1.26
--- object.cpp 24 Feb 2002 17:25:02 -0000 1.27
***************
*** 134,138 ****
ImageHeader *imhd;
int x,y;
- AdjustBoxResult abr;
if(!(_features & GF_SMALL_HEADER)) {
--- 134,137 ----
***************
*** 168,178 ****
}
-
- // abr = adjustXYToBeInBox(0, x, y);
- // _xPos = abr.x;
- // _yPos = abr.y;
- // _xPos = x;
- // _yPos = y;
- // _dir = oldDirToNewDir(od->actordir&3);
}
--- 167,170 ----
***************
*** 356,361 ****
ImageHeader *imhd;
RoomHeader *roomhdr;
!
! CodeHeader *cdhd;
CHECK_HEAP
--- 348,352 ----
ImageHeader *imhd;
RoomHeader *roomhdr;
! CodeHeader *cdhd;
CHECK_HEAP
***************
*** 422,430 ****
byte *ptr;
uint16 obim_id;
! byte *room,*searchptr;
! ImageHeader *imhd;
! RoomHeader *roomhdr;
!
! CodeHeader *cdhd;
CHECK_HEAP
--- 413,418 ----
byte *ptr;
uint16 obim_id;
! byte *room,*searchptr;
! RoomHeader *roomhdr;
CHECK_HEAP
***************
*** 484,491 ****
}
! void Scumm::setupRoomObject(ObjectData *od, byte *room) {
! byte *obcd;
! CodeHeader *cdhd;
! ImageHeader *imhd;
if(_features & GF_SMALL_HEADER) {
--- 472,478 ----
}
! void Scumm::setupRoomObject(ObjectData *od, byte *room) {
! CodeHeader *cdhd;
! ImageHeader *imhd; // Full throttle hack
if(_features & GF_SMALL_HEADER) {
***************
*** 585,590 ****
void Scumm::clearOwnerOf(int obj) {
int i,j;
! uint16 *a;
! byte *ptr;
stopObjectScript(obj);
--- 572,576 ----
void Scumm::clearOwnerOf(int obj) {
int i,j;
! uint16 *a;
stopObjectScript(obj);
***************
*** 977,987 ****
}
! void Scumm::setCursorImg(uint img, uint room, uint imgindex) {
! byte *ptr;
! int index;
int w,h;
! byte *roomptr,*obim,*dataptr,*bomp;
! RoomHeader *rmhd;
! int i,numobj;
uint32 size;
FindObjectInRoom foir;
--- 963,969 ----
}
! void Scumm::setCursorImg(uint img, uint room, uint imgindex) {
int w,h;
! byte *dataptr,*bomp;
uint32 size;
FindObjectInRoom foir;
***************
*** 1083,1090 ****
int index;
ObjectData *od;
- int width,height;
- byte *outptr;
- int x,y;
- byte *dataptr;
BompDrawData bdd;
--- 1065,1068 ----
***************
*** 1123,1128 ****
bdd.x = eo->x;
bdd.y = eo->y;
! bdd.scale_x = eo->j;
! bdd.scale_y = eo->k;
updateDirtyRect(vs->number, bdd.x, bdd.x+bdd.srcwidth, bdd.y, bdd.y+bdd.srcheight, 0);
--- 1101,1106 ----
bdd.x = eo->x;
bdd.y = eo->y;
! bdd.scale_x = (unsigned char)eo->j;
! bdd.scale_y = (unsigned char)eo->k;
updateDirtyRect(vs->number, bdd.x, bdd.x+bdd.srcwidth, bdd.y, bdd.y+bdd.srcheight, 0);
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/resource.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** resource.cpp 23 Feb 2002 23:23:28 -0000 1.40
--- resource.cpp 24 Feb 2002 17:25:02 -0000 1.41
***************
*** 25,29 ****
/* Open a room */
void Scumm::openRoom(int room) {
! uint room_offs, roomlimit;
char buf[256];
--- 25,29 ----
/* Open a room */
void Scumm::openRoom(int room) {
! int room_offs, roomlimit;
char buf[256];
***************
*** 648,652 ****
int Scumm::readSoundResource(int type, int index) {
uint32 pos, total_size, size, tag,basetag;
- int i;
int pri, best_pri;
uint32 best_size, best_offs;
--- 648,651 ----
***************
*** 891,895 ****
byte *findResource(uint32 tag, byte *searchin, int index) {
! uint32 maxsize,curpos,totalsize,size;
assert(searchin);
--- 890,894 ----
byte *findResource(uint32 tag, byte *searchin, int index) {
! uint32 curpos,totalsize,size;
assert(searchin);
***************
*** 921,925 ****
byte *findResourceSmall(uint32 tag, byte *searchin, int index) {
! uint32 maxsize,curpos,totalsize,size;
uint16 smallTag;
--- 920,924 ----
byte *findResourceSmall(uint32 tag, byte *searchin, int index) {
! uint32 curpos,totalsize,size;
uint16 smallTag;
***************
*** 1057,1061 ****
void Scumm::loadPtrToResource(int type, int resindex, byte *source) {
! byte *ptr, *alloced;
int i,len;
--- 1056,1060 ----
void Scumm::loadPtrToResource(int type, int resindex, byte *source) {
! byte *alloced;
int i,len;
Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saveload.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** saveload.cpp 3 Feb 2002 16:38:29 -0000 1.25
--- saveload.cpp 24 Feb 2002 17:25:02 -0000 1.26
***************
*** 68,72 ****
Serializer ser;
int sb,sh;
- SoundEngine *se;
makeSavegameName(filename, slot, compat);
--- 68,71 ----
***************
*** 157,161 ****
SerializerStream out;
SaveGameHeader hdr;
- bool result;
int len;
--- 156,159 ----
***************
*** 525,533 ****
void Scumm::saveLoadResource(Serializer *ser, int type, int index) {
byte *ptr;
! uint32 size,sizele;
! byte flag;
/* don't save/load these resource types */
! if (/*type==rtFlObject ||*/ type==rtTemp || type==rtBuffer || res.mode[type])
return;
--- 523,530 ----
void Scumm::saveLoadResource(Serializer *ser, int type, int index) {
byte *ptr;
! uint32 size;
/* don't save/load these resource types */
! if (type==rtTemp || type==rtBuffer || res.mode[type])
return;
***************
*** 624,630 ****
}
switch(filetype) {
! case sleByte: saveByte(data); break;
case sleUint16:
! case sleInt16:saveWord(data); break;
case sleInt32:
case sleUint32:saveUint32(data); break;
--- 621,627 ----
}
switch(filetype) {
! case sleByte: saveByte((byte)data); break;
case sleUint16:
! case sleInt16:saveWord((int16)data); break;
case sleInt32:
case sleUint32:saveUint32(data); break;
***************
*** 644,651 ****
}
if (datasize==1) {
! *(byte*)at = data;
at += 1;
} else if (datasize==2) {
! *(uint16*)at = data;
at += 2;
} else if (datasize==4) {
--- 641,648 ----
}
if (datasize==1) {
! *(byte*)at = (byte)data;
at += 1;
} else if (datasize==2) {
! *(uint16*)at = (uint16)data;
at += 2;
} else if (datasize==4) {
***************
*** 674,678 ****
byte *at;
int size;
- int value;
int num;
void *ptr;
--- 671,674 ----
***************
*** 705,707 ****
}
}
-
--- 701,702 ----
Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** script.cpp 15 Feb 2002 06:42:40 -0000 1.21
--- script.cpp 24 Feb 2002 17:25:02 -0000 1.22
***************
*** 331,336 ****
void Scumm::writeVar(uint var, int value) {
- int a;
-
if (!(var&0xF000)) {
checkRange(_numVariables-1, 0, var, "Variable %d out of range(w)");
--- 331,334 ----
***************
*** 511,515 ****
if (vm.slot[_curExecScript].status == 2 &&
vm.slot[_curExecScript].didexec == 0) {
! _currentScript = _curExecScript;
getScriptBaseAddress();
getScriptEntryPoint();
--- 509,513 ----
if (vm.slot[_curExecScript].status == 2 &&
vm.slot[_curExecScript].didexec == 0) {
! _currentScript = (char)_curExecScript;
getScriptBaseAddress();
getScriptEntryPoint();
***************
*** 833,838 ****
#else
! int shr,dir;
! bool inRoom;
Actor *a;
--- 831,835 ----
#else
! int dir;
Actor *a;
***************
*** 927,931 ****
if (array&0x4000) {
! _arrays[id] = vm.slot[_currentScript].number;
}
--- 924,928 ----
if (array&0x4000) {
! _arrays[id] = (char)vm.slot[_currentScript].number;
}
Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** script_v1.cpp 20 Feb 2002 01:56:41 -0000 1.36
--- script_v1.cpp 24 Feb 2002 17:25:02 -0000 1.37
***************
*** 932,936 ****
getWordVararg(table);
for (i=0; i<16; i++)
! charset._colorMap[i] = _charsetData[string[1].t_charset][i] = table[i];
break;
}
--- 932,936 ----
getWordVararg(table);
for (i=0; i<16; i++)
! charset._colorMap[i] = _charsetData[string[1].t_charset][i] = (unsigned char)table[i];
break;
}
***************
*** 1566,1570 ****
void Scumm::o5_printEgo() {
! _actorToPrintStrFor = _vars[VAR_EGO];
decodeParseString();
}
--- 1566,1570 ----
void Scumm::o5_printEgo() {
! _actorToPrintStrFor = (unsigned char)_vars[VAR_EGO];
decodeParseString();
}
***************
*** 2143,2147 ****
int a,b;
byte *ptr;
- int tempRoom;
verb = getVarOrDirectByte(0x80);
--- 2143,2146 ----
Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v2.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** script_v2.cpp 23 Feb 2002 23:23:28 -0000 1.20
--- script_v2.cpp 24 Feb 2002 17:25:02 -0000 1.21
***************
*** 709,713 ****
void Scumm::o6_cursorCommand() {
! int a,num,i;
int16 args[16];
--- 709,713 ----
void Scumm::o6_cursorCommand() {
! int a,i;
int16 args[16];
***************
*** 758,762 ****
getStackList(args,sizeof(args)/sizeof(args[0]));
for (i=0; i<16; i++)
! charset._colorMap[i] = _charsetData[string[1].t_charset][i] = args[i];
break;
case 0xD6:
--- 758,762 ----
getStackList(args,sizeof(args)/sizeof(args[0]));
for (i=0; i<16; i++)
! charset._colorMap[i] = _charsetData[string[1].t_charset][i] = (unsigned char)args[i];
break;
case 0xD6:
***************
*** 1205,1209 ****
void Scumm::o6_resourceRoutines() {
int res;
- int obj,room;
switch(fetchScriptByte()) {
--- 1205,1208 ----
***************
*** 1831,1836 ****
void Scumm::o6_wait() {
- byte oldaddr;
-
switch(fetchScriptByte()) {
case 168: {
--- 1830,1833 ----
***************
*** 2010,2014 ****
void Scumm::o6_talkEgo() {
! _actorToPrintStrFor = _vars[VAR_EGO];
_messagePtr = _scriptPointer;
setStringVars(0);
--- 2007,2011 ----
void Scumm::o6_talkEgo() {
! _actorToPrintStrFor = (unsigned char)_vars[VAR_EGO];
_messagePtr = _scriptPointer;
setStringVars(0);
***************
*** 2018,2022 ****
void Scumm::o6_dim() {
- byte b;
int data;
--- 2015,2018 ----
***************
*** 2188,2192 ****
case 107:
a = derefActorSafe(args[1], "o6_miscops: 107");
! a->scalex = args[2];
a->needBgReset = true;
a->needRedraw = true;
--- 2184,2188 ----
case 107:
a = derefActorSafe(args[1], "o6_miscops: 107");
! a->scalex = (unsigned char)args[2];
a->needBgReset = true;
a->needRedraw = true;
***************
*** 2257,2261 ****
case 107: /* set actor scale */
a = derefActorSafe(args[1], "o6_miscops: 107");
! a->scalex = args[2];
a->needBgReset = true;
a->needRedraw = true;
--- 2253,2257 ----
case 107: /* set actor scale */
a = derefActorSafe(args[1], "o6_miscops: 107");
! a->scalex = (unsigned char)args[2];
a->needBgReset = true;
a->needRedraw = true;
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** scummvm.cpp 23 Feb 2002 23:23:28 -0000 1.46
--- scummvm.cpp 24 Feb 2002 17:25:02 -0000 1.47
***************
*** 183,190 ****
}
! void Scumm::scummMain(int argc, char **argv) {
! int tmr, i;
! Actor *a;
!
charset._vm = this;
gdi._vm = this;
--- 183,187 ----
}
! void Scumm::scummMain(int argc, char **argv) {
charset._vm = this;
gdi._vm = this;
Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sdl.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** sdl.cpp 22 Feb 2002 16:06:09 -0000 1.34
--- sdl.cpp 24 Feb 2002 17:25:02 -0000 1.35
***************
*** 466,470 ****
void cd_playtrack(int track, int offset, int delay) {
SDL_CDStatus(cdrom);
! SDL_CDPlayTracks(cdrom, track, (offset * 7.5) - 22650, 0, delay * 7.5);
}
--- 466,470 ----
void cd_playtrack(int track, int offset, int delay) {
SDL_CDStatus(cdrom);
! SDL_CDPlayTracks(cdrom, track, (int)((offset * 7.5) - 22650), 0, (int)(delay * 7.5));
}
***************
*** 549,553 ****
int main(int argc, char* argv[]) {
! int delta,tmp;
int last_time, new_time;
--- 549,553 ----
int main(int argc, char* argv[]) {
! int delta;
int last_time, new_time;
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** sound.cpp 15 Feb 2002 00:46:51 -0000 1.17
--- sound.cpp 24 Feb 2002 17:25:02 -0000 1.18
***************
*** 85,89 ****
#if !defined(FULL_THROTTLE)
if (se)
! _vars[VAR_SOUNDRESULT] = se->do_command(data[0],data[1],data[2],data[3],data[4],data[5],data[6],data[7]);
#endif
}
--- 85,89 ----
#if !defined(FULL_THROTTLE)
if (se)
! _vars[VAR_SOUNDRESULT] = (short)se->do_command(data[0],data[1],data[2],data[3],data[4],data[5],data[6],data[7]);
#endif
}
***************
*** 141,146 ****
void Scumm::startTalkSound(uint32 offset, uint32 b, int mode) {
int num, i;
! byte file_byte,file_byte_2;
! uint16 elem;
if (!_sfxFile) {
--- 141,145 ----
void Scumm::startTalkSound(uint32 offset, uint32 b, int mode) {
int num, i;
! byte file_byte,file_byte_2;
if (!_sfxFile) {
***************
*** 433,438 ****
void MixerChannel::mix(int16 *data, uint32 len) {
! int8 *s;
! int i;
uint32 fp_pos, fp_speed;
--- 432,436 ----
void MixerChannel::mix(int16 *data, uint32 len) {
! int8 *s;
uint32 fp_pos, fp_speed;
Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/string.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** string.cpp 19 Feb 2002 22:36:09 -0000 1.24
--- string.cpp 24 Feb 2002 17:25:02 -0000 1.25
***************
*** 281,286 ****
if (!_keepText) {
if(_features & GF_OLD256) {
- int lenght;
-
gdi._mask_left = string[0].xpos;
gdi._mask_top = string[0].ypos;
--- 281,284 ----
Index: verbs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/verbs.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** verbs.cpp 15 Feb 2002 17:21:54 -0000 1.17
--- verbs.cpp 24 Feb 2002 17:25:02 -0000 1.18
***************
*** 161,165 ****
void Scumm::drawVerbBitmap(int vrb, int x, int y) {
- int nozbufs;
VirtScreen *vs;
VerbSlot *vst;
--- 161,164 ----
***************
*** 187,199 ****
obim = getResourceAddress(rtVerb, vrb);
if (_features & GF_SMALL_HEADER) {
! ObjectData *od;
! int index, obj;
obj = READ_LE_UINT16(obim+6);
! size = READ_LE_UINT32(obim);
!
! imgw = (*(obim+size+11)) ;
! imgh = (*(obim+size+17))>>3 ;
! imptr = (obim+8);
} else {
imhd = (ImageHeader*)findResourceData(MKID('IMHD'), obim);
--- 186,196 ----
obim = getResourceAddress(rtVerb, vrb);
if (_features & GF_SMALL_HEADER) {
! int obj;
obj = READ_LE_UINT16(obim+6);
! size = READ_LE_UINT32(obim);
+ imgw = (*(obim+size+11)) ;
+ imgh = (*(obim+size+17))>>3 ;
+ imptr = (obim+8);
} else {
imhd = (ImageHeader*)findResourceData(MKID('IMHD'), obim);
- Previous message: [Scummvm-cvs-logs] CVS: scummvm scummsys.h,1.18,1.19 scummvm.dsp,1.18,1.19
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sound adlib.cpp,1.4,1.5 fmopl.cpp,1.1,1.2 imuse.cpp,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list