[Scummvm-cvs-logs] CVS: scummvm/scumm charset.cpp,2.105,2.106 cursor.cpp,2.16,2.17 debugger.cpp,1.129,1.130 gfx.cpp,2.307,2.308 intern.h,2.260,2.261 nut_renderer.cpp,1.50,1.51 object.cpp,1.184,1.185 resource.cpp,1.270,1.271 saveload.cpp,1.175,1.176 script_v5.cpp,1.262,1.263 script_v6.cpp,1.403,1.404 script_v6he.cpp,2.120,2.121 script_v7he.cpp,2.96,2.97 scumm.cpp,1.211,1.212 scumm.h,1.484,1.485 string.cpp,1.252,1.253
Max Horn
fingolfin at users.sourceforge.net
Sat Sep 18 15:43:02 CEST 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3077
Modified Files:
charset.cpp cursor.cpp debugger.cpp gfx.cpp intern.h
nut_renderer.cpp object.cpp resource.cpp saveload.cpp
script_v5.cpp script_v6.cpp script_v6he.cpp script_v7he.cpp
scumm.cpp scumm.h string.cpp
Log Message:
Rename some member vars to avoid _ followed by an uppercase letter. More of those are left in the code, though (and I am not really sure whether we want to change that, so far we had no problems caused by this)
Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/charset.cpp,v
retrieving revision 2.105
retrieving revision 2.106
diff -u -d -r2.105 -r2.106
--- charset.cpp 31 Aug 2004 07:40:28 -0000 2.105
+++ charset.cpp 18 Sep 2004 22:42:43 -0000 2.106
@@ -82,7 +82,7 @@
// do spacing for variable width old-style font
int CharsetRendererClassic::getCharWidth(byte chr) {
- if (chr >= 0x80 && _vm->_CJKMode)
+ if (chr >= 0x80 && _vm->_useCJKMode)
return 6;
int spacing = 0;
@@ -1043,7 +1043,7 @@
int offsX, offsY;
VirtScreen *vs;
const byte *charPtr;
- int is2byte = (chr >= 0x80 && _vm->_CJKMode) ? 1 : 0;
+ int is2byte = (chr >= 0x80 && _vm->_useCJKMode) ? 1 : 0;
checkRange(_vm->_numCharsets - 1, 1, _curId, "Printing with bad charset %d");
@@ -1318,7 +1318,7 @@
int width = _current->getCharWidth(chr);
int height = _current->getCharHeight(chr);
- if (chr >= 256 && _vm->_CJKMode)
+ if (chr >= 256 && _vm->_useCJKMode)
width = 16;
shadow.right = _left + width + 2;
Index: cursor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/cursor.cpp,v
retrieving revision 2.16
retrieving revision 2.17
diff -u -d -r2.16 -r2.17
--- cursor.cpp 18 Sep 2004 22:23:43 -0000 2.16
+++ cursor.cpp 18 Sep 2004 22:42:43 -0000 2.17
@@ -148,7 +148,7 @@
}
void ScummEngine_v7he::setCursorFromImg(uint img, uint room, uint imgindex) {
- _Win32ResExtractor->setCursor(img);
+ _win32ResExtractor->setCursor(img);
}
void ScummEngine_v6::setCursorFromImg(uint img, uint room, uint imgindex) {
Index: debugger.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/debugger.cpp,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- debugger.cpp 2 Sep 2004 17:29:48 -0000 1.129
+++ debugger.cpp 18 Sep 2004 22:42:43 -0000 1.130
@@ -494,7 +494,7 @@
} else if (!strcmp(argv[2], "state")) {
_vm->putState(obj, atoi(argv[3]));
//is BgNeedsRedraw enough?
- _vm->_BgNeedsRedraw = true;
+ _vm->_bgNeedsRedraw = true;
} else if (!strcmp(argv[2], "name")) {
DebugPrintf("Name of object %d: %s\n", obj, _vm->getObjOrActorName(obj));
} else {
Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.307
retrieving revision 2.308
diff -u -d -r2.307 -r2.308
--- gfx.cpp 18 Sep 2004 21:40:07 -0000 2.307
+++ gfx.cpp 18 Sep 2004 22:42:43 -0000 2.308
@@ -571,7 +571,7 @@
byte *room = getResourceAddress(rtRoomImage, _roomResource) + _IM00_offs;
if (findResource(MKID('BMAP'), room) != NULL) {
if (_fullRedraw) {
- _BgNeedsRedraw = false;
+ _bgNeedsRedraw = false;
gdi.drawBMAPBg(room, &virtscr[0], _screenStartStrip, _screenWidth);
}
cont = false;
@@ -582,13 +582,13 @@
if (!cont) {
drawRoomObjects(val);
- _BgNeedsRedraw = false;
+ _bgNeedsRedraw = false;
return;
}
}
// Redraw parts of the background which are marked as dirty.
- if (!_fullRedraw && _BgNeedsRedraw) {
+ if (!_fullRedraw && _bgNeedsRedraw) {
for (i = 0; i != gdi._numStrips; i++) {
if (testGfxUsageBit(_screenStartStrip + i, USAGE_BIT_DIRTY)) {
redrawBGStrip(i, 1);
@@ -605,7 +605,7 @@
val = 1;
redrawBGStrip(0, 1);
} else if (_fullRedraw != 0 || diff != 0) {
- _BgNeedsRedraw = false;
+ _bgNeedsRedraw = false;
redrawBGStrip(0, gdi._numStrips);
}
} else {
@@ -616,14 +616,14 @@
val = 1;
redrawBGStrip(0, 1);
} else if (_fullRedraw != 0 || camera._cur.x != camera._last.x) {
- _BgNeedsRedraw = false;
+ _bgNeedsRedraw = false;
_flashlight.isDrawn = false;
redrawBGStrip(0, gdi._numStrips);
}
}
drawRoomObjects(val);
- _BgNeedsRedraw = false;
+ _bgNeedsRedraw = false;
}
void ScummEngine::redrawBGStrip(int start, int num) {
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.260
retrieving revision 2.261
diff -u -d -r2.260 -r2.261
--- intern.h 18 Sep 2004 22:23:43 -0000 2.260
+++ intern.h 18 Sep 2004 22:42:43 -0000 2.261
@@ -616,7 +616,7 @@
const char *desc;
};
- Win32ResExtractor *_Win32ResExtractor;
+ Win32ResExtractor *_win32ResExtractor;
const OpcodeEntryV7he *_opcodesV7he;
Index: nut_renderer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/nut_renderer.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- nut_renderer.cpp 8 Aug 2004 22:09:50 -0000 1.50
+++ nut_renderer.cpp 18 Sep 2004 22:42:43 -0000 1.51
@@ -204,7 +204,7 @@
return 0;
}
- if (c >= 0x80 && _vm->_CJKMode) {
+ if (c >= 0x80 && _vm->_useCJKMode) {
if (_vm->_gameId == GID_CMI)
return 8;
if (_vm->_gameId == GID_DIG)
@@ -225,7 +225,7 @@
return 0;
}
- if (c >= 0x80 && _vm->_CJKMode) {
+ if (c >= 0x80 && _vm->_useCJKMode) {
if (_vm->_gameId == GID_CMI)
return 16;
if (_vm->_gameId == GID_DIG)
@@ -265,7 +265,7 @@
y += offsetY[i];
color = cTable[i];
- if (c >= 256 && _vm->_CJKMode)
+ if (c >= 256 && _vm->_useCJKMode)
draw2byte(s, c, x, y, color);
else
drawChar(s, (byte)c, x, y, color);
Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -d -r1.184 -r1.185
--- object.cpp 12 Sep 2004 10:51:00 -0000 1.184
+++ object.cpp 18 Sep 2004 22:42:43 -0000 1.185
@@ -430,7 +430,7 @@
int x, a, numstrip;
int tmp;
- if (_BgNeedsRedraw)
+ if (_bgNeedsRedraw)
arg = 0;
if (od.obj_nr == 0)
@@ -924,7 +924,7 @@
setGfxUsageBit(strip, USAGE_BIT_DIRTY);
}
}
- _BgNeedsRedraw = true;
+ _bgNeedsRedraw = true;
return;
}
}
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -d -r1.270 -r1.271
--- resource.cpp 17 Sep 2004 05:43:37 -0000 1.270
+++ resource.cpp 18 Sep 2004 22:42:43 -0000 1.271
@@ -350,8 +350,8 @@
return;
if (_heversion >= 70) { // Windows titles
- num = READ_LE_UINT16(_HEV7RoomOffsets);
- ptr = _HEV7RoomOffsets + 2;
+ num = READ_LE_UINT16(_heV7RoomOffsets);
+ ptr = _heV7RoomOffsets + 2;
for (i = 0; i < num; i++) {
_roomFileOffsets[i] = READ_LE_UINT32(ptr);
ptr += 4;
@@ -563,8 +563,8 @@
case MKID('DLFL'):
i = _fileHandle.readUint16LE();
_fileHandle.seek(-2, SEEK_CUR);
- _HEV7RoomOffsets = (byte *)calloc(2 + (i * 4), 1);
- _fileHandle.read(_HEV7RoomOffsets, (2 + (i * 4)) );
+ _heV7RoomOffsets = (byte *)calloc(2 + (i * 4), 1);
+ _fileHandle.read(_heV7RoomOffsets, (2 + (i * 4)) );
break;
case MKID('DIRM'):
@@ -701,7 +701,7 @@
res.roomoffs[id][i] = _fileHandle.readUint32LE();
if (id == rtRoom && _heversion >= 70)
- _HEV7RoomIntOffsets[i] = res.roomoffs[id][i];
+ _heV7RoomIntOffsets[i] = res.roomoffs[id][i];
}
if (_heversion >= 70) {
@@ -735,7 +735,7 @@
res.globsize[id] = (uint32 *)calloc(num, sizeof(uint32));
if (id == rtRoom)
- _HEV7RoomIntOffsets = (uint32 *)calloc(num, sizeof(uint32));
+ _heV7RoomIntOffsets = (uint32 *)calloc(num, sizeof(uint32));
}
}
@@ -832,7 +832,7 @@
if (_version == 8)
fileOffs = 8;
else if (_heversion >= 70)
- fileOffs = _HEV7RoomIntOffsets[idx];
+ fileOffs = _heV7RoomIntOffsets[idx];
else
fileOffs = 0;
} else {
@@ -2186,8 +2186,8 @@
free(res.globsize[i]);
}
if (_heversion >= 70) {
- free(_HEV7RoomIntOffsets);
- free(_HEV7RoomOffsets);
+ free(_heV7RoomIntOffsets);
+ free(_heV7RoomOffsets);
}
}
Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -d -r1.175 -r1.176
--- saveload.cpp 18 Sep 2004 14:08:00 -0000 1.175
+++ saveload.cpp 18 Sep 2004 22:42:43 -0000 1.176
@@ -538,7 +538,7 @@
MKLINE(ScummEngine, _switchRoomEffect, sleByte, VER(8)),
MKLINE(ScummEngine, _newEffect, sleByte, VER(8)),
MKLINE(ScummEngine, _switchRoomEffect2, sleByte, VER(8)),
- MKLINE(ScummEngine, _BgNeedsRedraw, sleByte, VER(8)),
+ MKLINE(ScummEngine, _bgNeedsRedraw, sleByte, VER(8)),
// The state of palManipulate is stored only since V10
MKLINE(ScummEngine, _palManipStart, sleByte, VER(10)),
@@ -718,7 +718,7 @@
s->saveLoadArrayOf(vm.slot, NUM_SCRIPT_SLOT, sizeof(vm.slot[0]), scriptSlotEntries);
if (_heversion >= 71)
- s->saveLoadArrayOf(_WizPolygons, _WizNumPolygons, sizeof(_WizPolygons[0]), polygonEntries);
+ s->saveLoadArrayOf(_wizPolygons, _wizNumPolygons, sizeof(_wizPolygons[0]), polygonEntries);
s->saveLoadArrayOf(_objs, _numLocalObjects, sizeof(_objs[0]), objectEntries);
if (s->isLoading() && savegameVersion < VER(13)) {
// Since roughly v13 of the save games, the objs storage has changed a bit
Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -d -r1.262 -r1.263
--- script_v5.cpp 18 Sep 2004 20:50:14 -0000 1.262
+++ script_v5.cpp 18 Sep 2004 22:42:43 -0000 1.263
@@ -2073,7 +2073,7 @@
state = getVarOrDirectByte(PARAM_2);
putState(obj, state);
markObjectRectAsDirty(obj);
- if (_BgNeedsRedraw)
+ if (_bgNeedsRedraw)
clearDrawObjectQueue();
}
Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.403
retrieving revision 1.404
diff -u -d -r1.403 -r1.404
--- script_v6.cpp 18 Sep 2004 20:50:14 -0000 1.403
+++ script_v6.cpp 18 Sep 2004 22:42:43 -0000 1.404
@@ -1064,7 +1064,7 @@
putState(obj, state);
markObjectRectAsDirty(obj);
- if (_BgNeedsRedraw)
+ if (_bgNeedsRedraw)
clearDrawObjectQueue();
}
Index: script_v6he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6he.cpp,v
retrieving revision 2.120
retrieving revision 2.121
diff -u -d -r2.120 -r2.121
--- script_v6he.cpp 18 Sep 2004 22:09:34 -0000 2.120
+++ script_v6he.cpp 18 Sep 2004 22:42:43 -0000 2.121
@@ -398,7 +398,7 @@
putState(obj, state);
markObjectRectAsDirty(obj);
- if (_BgNeedsRedraw)
+ if (_bgNeedsRedraw)
clearDrawObjectQueue();
}
Index: script_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v7he.cpp,v
retrieving revision 2.96
retrieving revision 2.97
diff -u -d -r2.96 -r2.97
--- script_v7he.cpp 18 Sep 2004 22:23:43 -0000 2.96
+++ script_v7he.cpp 18 Sep 2004 22:42:44 -0000 2.97
@@ -937,46 +937,46 @@
int vert2y, int vert3x, int vert3y, int vert4x, int vert4y) {
int i;
- for (i = 0; i < _WizNumPolygons; i++)
- if (_WizPolygons[i].id == 0)
+ for (i = 0; i < _wizNumPolygons; i++)
+ if (_wizPolygons[i].id == 0)
break;
- if (i == _WizNumPolygons) {
+ if (i == _wizNumPolygons) {
error("ScummEngine::polygonStore: out of polygon slot, max = %d",
- _WizNumPolygons);
+ _wizNumPolygons);
}
- _WizPolygons[i].vert[0].x = vert1x;
- _WizPolygons[i].vert[0].y = vert1y;
- _WizPolygons[i].vert[1].x = vert2x;
- _WizPolygons[i].vert[1].y = vert2y;
- _WizPolygons[i].vert[2].x = vert3x;
- _WizPolygons[i].vert[2].y = vert3y;
- _WizPolygons[i].vert[3].x = vert4x;
- _WizPolygons[i].vert[3].y = vert4y;
- _WizPolygons[i].vert[4].x = vert1x;
- _WizPolygons[i].vert[4].y = vert1y;
- _WizPolygons[i].id = id;
- _WizPolygons[i].numVerts = 5;
- _WizPolygons[i].flag = flag;
+ _wizPolygons[i].vert[0].x = vert1x;
+ _wizPolygons[i].vert[0].y = vert1y;
+ _wizPolygons[i].vert[1].x = vert2x;
+ _wizPolygons[i].vert[1].y = vert2y;
+ _wizPolygons[i].vert[2].x = vert3x;
+ _wizPolygons[i].vert[2].y = vert3y;
+ _wizPolygons[i].vert[3].x = vert4x;
+ _wizPolygons[i].vert[3].y = vert4y;
+ _wizPolygons[i].vert[4].x = vert1x;
+ _wizPolygons[i].vert[4].y = vert1y;
+ _wizPolygons[i].id = id;
+ _wizPolygons[i].numVerts = 5;
+ _wizPolygons[i].flag = flag;
- _WizPolygons[i].bound.left = 10000;
- _WizPolygons[i].bound.top = 10000;
- _WizPolygons[i].bound.right = -10000;
- _WizPolygons[i].bound.bottom = -10000;
+ _wizPolygons[i].bound.left = 10000;
+ _wizPolygons[i].bound.top = 10000;
+ _wizPolygons[i].bound.right = -10000;
+ _wizPolygons[i].bound.bottom = -10000;
for (int j = 0; j < 5; j++) {
- _WizPolygons[i].bound.left = MIN(_WizPolygons[i].bound.left, _WizPolygons[i].vert[j].x);
- _WizPolygons[i].bound.top = MIN(_WizPolygons[i].bound.top, _WizPolygons[i].vert[j].y);
- _WizPolygons[i].bound.right = MAX(_WizPolygons[i].bound.right, _WizPolygons[i].vert[j].x);
- _WizPolygons[i].bound.bottom = MAX(_WizPolygons[i].bound.bottom, _WizPolygons[i].vert[j].y);
+ _wizPolygons[i].bound.left = MIN(_wizPolygons[i].bound.left, _wizPolygons[i].vert[j].x);
+ _wizPolygons[i].bound.top = MIN(_wizPolygons[i].bound.top, _wizPolygons[i].vert[j].y);
+ _wizPolygons[i].bound.right = MAX(_wizPolygons[i].bound.right, _wizPolygons[i].vert[j].x);
+ _wizPolygons[i].bound.bottom = MAX(_wizPolygons[i].bound.bottom, _wizPolygons[i].vert[j].y);
}
}
void ScummEngine_v7he::polygonErase(int fromId, int toId) {
- for (int i = 0; i < _WizNumPolygons; i++) {
- if (_WizPolygons[i].id >= fromId && _WizPolygons[i].id <= toId)
- memset(&_WizPolygons[i], 0, sizeof(WizPolygon));
+ for (int i = 0; i < _wizNumPolygons; i++) {
+ if (_wizPolygons[i].id >= fromId && _wizPolygons[i].id <= toId)
+ memset(&_wizPolygons[i], 0, sizeof(WizPolygon));
}
}
@@ -988,10 +988,10 @@
}
int ScummEngine_v7he::polygonHit(int id, int x, int y) {
- for (int i = 0; i < _WizNumPolygons; i++) {
- if ((!id || _WizPolygons[i].id == id) && _WizPolygons[i].bound.contains(x, y)) {
- if (polygonContains(_WizPolygons[i], x, y)) {
- return _WizPolygons[i].id;
+ for (int i = 0; i < _wizNumPolygons; i++) {
+ if ((!id || _wizPolygons[i].id == id) && _wizPolygons[i].bound.contains(x, y)) {
+ if (polygonContains(_wizPolygons[i], x, y)) {
+ return _wizPolygons[i].id;
}
}
}
@@ -1000,8 +1000,8 @@
}
bool ScummEngine_v7he::polygonDefined(int id) {
- for (int i = 0; i < _WizNumPolygons; i++)
- if (_WizPolygons[i].id == id)
+ for (int i = 0; i < _wizNumPolygons; i++)
+ if (_wizPolygons[i].id == id)
return true;
return false;
Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -d -r1.211 -r1.212
--- scumm.cpp 18 Sep 2004 20:29:13 -0000 1.211
+++ scumm.cpp 18 Sep 2004 22:42:44 -0000 1.212
@@ -616,7 +616,7 @@
_IM00_offs = 0;
_PALS_offs = 0;
_fullRedraw = false;
- _BgNeedsRedraw = false;
+ _bgNeedsRedraw = false;
_screenEffectFlag = false;
_completeScreenRedraw = false;
memset(&_cursor, 0, sizeof(_cursor));
@@ -681,8 +681,8 @@
_costumeRenderer = NULL;
_2byteFontPtr = 0;
_V1_talkingActor = 0;
- _WizNumPolygons = 200; // Used as constant in original
- _WizPolygons = NULL;
+ _wizNumPolygons = 200; // Used as constant in original
+ _wizPolygons = NULL;
_actorClipOverride.top = 0;
_actorClipOverride.bottom = 479;
@@ -973,7 +973,7 @@
loadLanguageBundle();
// Load CJK font
- _CJKMode = false;
+ _useCJKMode = false;
if ((_gameId == GID_DIG || _gameId == GID_CMI) && (_language == Common::KO_KOR || _language == Common::JA_JPN || _language == Common::ZH_TWN)) {
File fp;
const char *fontFile = NULL;
@@ -994,7 +994,7 @@
}
if (fontFile && fp.open(fontFile)) {
debug(2, "Loading CJK Font");
- _CJKMode = true;
+ _useCJKMode = true;
fp.seek(2, SEEK_CUR);
_2byteWidth = fp.readByte();
_2byteHeight = fp.readByte();
@@ -1024,7 +1024,7 @@
_2byteHeight = 16;
//use FM Towns font rom, since game files don't have kanji font resources
if (fp.open("fmt_fnt.rom")) {
- _CJKMode = true;
+ _useCJKMode = true;
debug(2, "Loading FM Towns Kanji rom");
_2byteFontPtr = new byte[((_2byteWidth + 7) / 8) * _2byteHeight * numChar];
fp.read(_2byteFontPtr, ((_2byteWidth + 7) / 8) * _2byteHeight * numChar);
@@ -1117,7 +1117,7 @@
ScummEngine_v7he::ScummEngine_v7he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16])
: ScummEngine_v6he(detector, syst, gs, md5sum) {
- _Win32ResExtractor = new Win32ResExtractor(this);
+ _win32ResExtractor = new Win32ResExtractor(this);
}
void ScummEngine::go() {
@@ -1397,10 +1397,10 @@
_keyDownMap[i] = false;
if (_heversion >= 70) {
- if (_WizPolygons)
- free (_WizPolygons);
+ if (_wizPolygons)
+ free (_wizPolygons);
- _WizPolygons = (WizPolygon *)calloc(_WizNumPolygons, sizeof(WizPolygon));
+ _wizPolygons = (WizPolygon *)calloc(_wizNumPolygons, sizeof(WizPolygon));
}
initScummVars();
@@ -1808,7 +1808,7 @@
if (_version > 3)
CHARSET_1();
- if (camera._cur.x != camera._last.x || _BgNeedsRedraw || _fullRedraw
+ if (camera._cur.x != camera._last.x || _bgNeedsRedraw || _fullRedraw
|| ((_features & GF_NEW_CAMERA) && camera._cur.y != camera._last.y)) {
redrawBGAreas();
}
@@ -2343,8 +2343,8 @@
stopCycle(0);
_sound->processSoundQues();
- if (_heversion >= 70 && _WizPolygons) {
- memset(_WizPolygons, 0, _WizNumPolygons * sizeof(WizPolygon));
+ if (_heversion >= 70 && _wizPolygons) {
+ memset(_wizPolygons, 0, _wizNumPolygons * sizeof(WizPolygon));
}
for (i = 0; i < _numRoomVariables; i++)
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.484
retrieving revision 1.485
diff -u -d -r1.484 -r1.485
--- scumm.h 18 Sep 2004 20:50:14 -0000 1.484
+++ scumm.h 18 Sep 2004 22:42:44 -0000 1.485
@@ -664,12 +664,12 @@
byte _resourceMapper[128];
uint32 _allocatedSize;
byte _expire_counter;
- byte *_HEV7RoomOffsets;
- uint32 *_HEV7RoomIntOffsets;
+ byte *_heV7RoomOffsets;
+ uint32 *_heV7RoomIntOffsets;
const byte *_resourceLastSearchBuf; // FIXME: need to put it to savefile?
uint32 _resourceLastSearchSize; // FIXME: need to put it to savefile?
- int _WizNumPolygons;
- WizPolygon *_WizPolygons;
+ int _wizNumPolygons;
+ WizPolygon *_wizPolygons;
void allocateArrays();
void openRoom(int room);
@@ -914,7 +914,7 @@
StripTable *_roomStrips;
//ender: fullscreen
- bool _fullRedraw, _BgNeedsRedraw;
+ bool _fullRedraw, _bgNeedsRedraw;
bool _screenEffectFlag, _completeScreenRedraw;
struct {
@@ -1190,7 +1190,7 @@
void translateText(const byte *text, byte *trans_buff); // Used by class ScummDialog
// Somewhat hackish stuff for 2 byte support (Chinese/Japanese/Korean)
- bool _CJKMode;
+ bool _useCJKMode;
int _2byteHeight;
int _2byteWidth;
byte *get2byteCharPtr(int idx);
Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -d -r1.252 -r1.253
--- string.cpp 18 Sep 2004 20:50:14 -0000 1.252
+++ string.cpp 18 Sep 2004 22:42:44 -0000 1.253
@@ -344,7 +344,7 @@
} else {
_charset->_left = _charset->_nextLeft;
_charset->_top = _charset->_nextTop;
- if (c & 0x80 && _CJKMode)
+ if (c & 0x80 && _useCJKMode)
if (_language == 6 && ((c > 0x84 && c < 0x88) || (c > 0x9f && c < 0xe0) || (c > 0xea && c <= 0xff)))
c = 0x20; //not in S-JIS
else
@@ -477,7 +477,7 @@
_charset->_blitAlso = true;
}
}
- if (c >= 0x80 && _CJKMode)
+ if (c >= 0x80 && _useCJKMode)
c += buf[i++] * 256;
_charset->printChar(c);
_charset->_blitAlso = false;
@@ -719,7 +719,7 @@
if (c != 0 && c != 0xFF) {
_charset->_left = _charset->_nextLeft;
_charset->_top = _charset->_nextTop;
- if (c >= 0x80 && _CJKMode)
+ if (c >= 0x80 && _useCJKMode)
c += *buf++ * 256;
_charset->printChar(c);
_charset->_nextLeft = _charset->_left;
More information about the Scummvm-git-logs
mailing list