diff options
| author | Strangerke | 2016-10-24 22:32:04 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2017-01-25 22:42:03 +0100 |
| commit | e0ad53224e50ec664088c4f29c49c24752f9c21d (patch) | |
| tree | 198bf054b15d5755060593a059082f28293aed55 /engines/cryo | |
| parent | cb23ed07777347be940eb0df22d153c02712ebd2 (diff) | |
| download | scummvm-rg350-e0ad53224e50ec664088c4f29c49c24752f9c21d.tar.gz scummvm-rg350-e0ad53224e50ec664088c4f29c49c24752f9c21d.tar.bz2 scummvm-rg350-e0ad53224e50ec664088c4f29c49c24752f9c21d.zip | |
CRYO: Simplify limitezonecurs
Diffstat (limited to 'engines/cryo')
| -rw-r--r-- | engines/cryo/eden.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/engines/cryo/eden.cpp b/engines/cryo/eden.cpp index 202e861f7d..ae4c28d81f 100644 --- a/engines/cryo/eden.cpp +++ b/engines/cryo/eden.cpp @@ -7403,14 +7403,8 @@ void EdenGame::affresult() { } void EdenGame::limitezonecurs(int16 xmin, int16 xmax, int16 ymin, int16 ymax) { - if (curs_x < xmin) - curs_x = xmin; - if (curs_x > xmax) - curs_x = xmax; - if (curs_y < ymin) - curs_y = ymin; - if (curs_y > ymax) - curs_y = ymax; + curs_x = CLIP(curs_x, xmin, xmax); + curs_y = CLIP(curs_y, ymin, ymax); } void EdenGame::PommeQ() { @@ -7846,7 +7840,7 @@ void EdenGame::bigphase1() { &EdenGame::phase560 }; - int16 phase = (p_global->phaseNum & ~3) + 0x10; //TODO: check me + int16 phase = (p_global->phaseNum & ~3) + 0x10; //TODO: check me debug("!!! big phase - %4X", phase); p_global->phaseActionsCount = 0; p_global->phaseNum = phase; @@ -8183,7 +8177,6 @@ void EdenGame::loadrestart() { void EdenGame::loadgame(char *name) { // filespec_t fs; // file_t handle; - int32 size; // CLFile_MakeStruct(0, 0, name, &fs); // CLFile_Open(&fs, 3, handle); @@ -8194,7 +8187,7 @@ void EdenGame::loadgame(char *name) { #define CLFile_Read(h, ptr, size) \ h->read(ptr, *size); - size = (char *)(&p_global->save_end) - (char *)(p_global); + int32 size = (char *)(&p_global->save_end) - (char *)(p_global); CLFile_Read(handle, p_global, &size); vavaoffsetin(); size = (char *)(&gameIcons[134]) - (char *)(&gameIcons[123]); |