thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

made files compile on unix

Browse source 
svn-id: r3434
This commit is contained in:
Ludvig Strigeus 2001-10-16 12:20:22 +00:00
parent 794163c1a3
commit eebe5f2f73
3 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
object.cpp
View file

@ -17,6 +17,9 @@
* *
* Change Log: * Change Log:
* $Log$ * $Log$
* Revision 1.4 2001/10/16 12:20:18 strigeus
* made files compile on unix
*
* Revision 1.3 2001/10/16 10:01:47 strigeus * Revision 1.3 2001/10/16 10:01:47 strigeus
* preliminary DOTT support * preliminary DOTT support
* *
@ -401,10 +404,10 @@ void Scumm::loadRoomObjects() {
_objs[i].obj_nr = READ_LE_UINT16(&cdhd->obj_id); _objs[i].obj_nr = READ_LE_UINT16(&cdhd->obj_id);
#if defined(DOTT) #if defined(DOTT)
_objs[i].numstrips = cdhd->w>>3; _objs[i].numstrips = READ_LE_UINT16(&cdhd->w)>>3;
_objs[i].height = cdhd->h>>3; _objs[i].height = READ_LE_UINT16(&cdhd->h)>>3;
_objs[i].x_pos = cdhd->x>>3; _objs[i].x_pos = ((int16)READ_LE_UINT16(&cdhd->x))>>3;
_objs[i].y_pos = cdhd->y>>3; _objs[i].y_pos = ((int16)READ_LE_UINT16(&cdhd->y))>>3;
#else #else
_objs[i].numstrips = cdhd->w; _objs[i].numstrips = cdhd->w;
_objs[i].height = cdhd->h; _objs[i].height = cdhd->h;
@ -758,4 +761,4 @@ int Scumm::getDistanceBetween(bool is_obj_1, int b, int c, bool is_obj_2, int e,
return getDist(x,y,x2,y2) * 0xFF / ((i + j)>>1); return getDist(x,y,x2,y2) * 0xFF / ((i + j)>>1);
} }
#endif #endif

5
resource.cpp
View file

@ -17,6 +17,9 @@
* *
* Change Log: * Change Log:
* $Log$ * $Log$
* Revision 1.4 2001/10/16 12:20:20 strigeus
* made files compile on unix
*
* Revision 1.3 2001/10/16 10:01:47 strigeus * Revision 1.3 2001/10/16 10:01:47 strigeus
* preliminary DOTT support * preliminary DOTT support
* *
@ -266,7 +269,7 @@ void Scumm::readIndexFile(int mode) {
void Scumm::readIndexFile() { void Scumm::readIndexFile() {
uint32 blocktype,itemsize; uint32 blocktype,itemsize;
int numblock = 0; int numblock = 0;
int num; int num, i;
debug(9, "readIndexFile()"); debug(9, "readIndexFile()");

5
scummvm.cpp
View file

@ -17,6 +17,9 @@
* *
* Change Log: * Change Log:
* $Log$ * $Log$
* Revision 1.8 2001/10/16 12:20:22 strigeus
* made files compile on unix
*
* Revision 1.7 2001/10/16 10:01:48 strigeus * Revision 1.7 2001/10/16 10:01:48 strigeus
* preliminary DOTT support * preliminary DOTT support
* *
@ -957,8 +960,10 @@ void CDECL debug(int level, const char *s, ...) {
} }
void checkHeap() { void checkHeap() {
#if defined(WIN32)
if (_heapchk() != _HEAPOK) { if (_heapchk() != _HEAPOK) {
error("Heap is invalid!"); error("Heap is invalid!");
} }
#endif
} }