[Scummvm-cvs-logs] CVS: scummvm/scumm costume.cpp,1.185,1.186 costume.h,1.36,1.37
Eugene Sandulenko
sev at users.sourceforge.net
Tue May 31 15:10:44 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga input.cpp,1.44,1.45 interface.cpp,1.98,1.99 interface.h,1.54,1.55 saga.h,1.97,1.98 saveload.cpp,1.11,1.12
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga input.cpp,1.45,1.46 interface.cpp,1.99,1.100 interface.h,1.55,1.56
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6929
Modified Files:
costume.cpp costume.h
Log Message:
Some stubs for C64 MM costume code
Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.cpp,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -d -r1.185 -r1.186
--- costume.cpp 25 May 2005 12:56:23 -0000 1.185
+++ costume.cpp 31 May 2005 22:09:35 -0000 1.186
@@ -1009,9 +1009,25 @@
_loaded.loadCostume(costume);
}
+static const byte actorColorsMMC64[] = {
+ 0, 7, 2, 6, 9, 1, 3, 7, 7, 1, 1, 9, 1, 4, 5, 5,
+ 4, 1, 0, 5, 4, 2, 2, 7, 7, 0, 6, 6, 6, 6, 6, 6
+};
+
void C64CostumeLoader::loadCostume(int id) {
+ const byte *ptr = _vm->getResourceAddress(rtCostume, id);
_id = id;
- _baseptr = _vm->getResourceAddress(rtCostume, id);
+ _baseptr = ptr + 9;
+
+ _format = 0x57;
+ _numColors = 0;
+ _numAnim = 0;
+ _mirror = 0;
+ _palette = &actorColorsMMC64[id];
+
+ _frameOffsets = _baseptr + READ_LE_UINT16(ptr + 5);
+ _dataOffsets = ptr;
+ _animCmds = _baseptr + READ_LE_UINT16(ptr + 7);
}
void C64CostumeLoader::costumeDecodeData(Actor *a, int frame, uint usemask) {
Index: costume.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- costume.h 21 May 2005 03:30:23 -0000 1.36
+++ costume.h 31 May 2005 22:09:35 -0000 1.37
@@ -67,14 +67,9 @@
byte increaseAnim(Actor *a, int slot);
};
-class C64CostumeLoader : public BaseCostumeLoader {
+class C64CostumeLoader : public ClassicCostumeLoader {
public:
- int _id;
- const byte *_baseptr;
- const byte *_dataOffsets;
- byte _numAnim;
-
- C64CostumeLoader(ScummEngine *vm) : BaseCostumeLoader(vm) {}
+ C64CostumeLoader(ScummEngine *vm) : ClassicCostumeLoader(vm) {}
void loadCostume(int id);
void costumeDecodeData(Actor *a, int frame, uint usemask);
byte increaseAnims(Actor *a);
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga input.cpp,1.44,1.45 interface.cpp,1.98,1.99 interface.h,1.54,1.55 saga.h,1.97,1.98 saveload.cpp,1.11,1.12
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga input.cpp,1.45,1.46 interface.cpp,1.99,1.100 interface.h,1.55,1.56
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list