aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2003-04-25 17:57:04 +0000
committerMax Horn2003-04-25 17:57:04 +0000
commit33e883aaf60092e1edf66d344bcb766b9ed64c57 (patch)
treeebae80a5a3103cf117f422cfcf8142a51ec7a046
parent733fb795ec88ae2b91750dc1db40ad4fcda089e9 (diff)
downloadscummvm-rg350-33e883aaf60092e1edf66d344bcb766b9ed64c57.tar.gz
scummvm-rg350-33e883aaf60092e1edf66d344bcb766b9ed64c57.tar.bz2
scummvm-rg350-33e883aaf60092e1edf66d344bcb766b9ed64c57.zip
changed turnProg from void* to uint16*
svn-id: r7113
-rw-r--r--sky/logic.cpp10
-rw-r--r--sky/struc.h2
2 files changed, 5 insertions, 7 deletions
diff --git a/sky/logic.cpp b/sky/logic.cpp
index 4224fd54bc..6313ccde7e 100644
--- a/sky/logic.cpp
+++ b/sky/logic.cpp
@@ -144,10 +144,9 @@ void SkyLogic::arAnim() {
}
void SkyLogic::arTurn() {
- _compact->frame = *(uint16 *)(_compact->extCompact->turnProg);
- ((uint16 *)(_compact->extCompact->turnProg))++;
+ _compact->frame = *_compact->extCompact->turnProg++;
- if (!*(uint16 *)(_compact->extCompact->turnProg)) { // turn done?
+ if (!*_compact->extCompact->turnProg) { // turn done?
// Back to ar mode
_compact->extCompact->arAnimIndex = 0;
_compact->logic = L_AR_ANIM;
@@ -170,9 +169,8 @@ void SkyLogic::anim() {
}
void SkyLogic::turn() {
- if (*(uint16 *)(_compact->extCompact->turnProg)) {
- _compact->frame = *(uint16 *)(_compact->extCompact->turnProg);
- ((uint16 *)(_compact->extCompact->turnProg))++;
+ if (*_compact->extCompact->turnProg) {
+ _compact->frame = *_compact->extCompact->turnProg++;
return;
}
diff --git a/sky/struc.h b/sky/struc.h
index 06c43718f4..80e86e860a 100644
--- a/sky/struc.h
+++ b/sky/struc.h
@@ -66,7 +66,7 @@ struct ExtCompact {
uint16 spTime;
uint16 arAnimIndex;
- void *turnProg;
+ uint16 *turnProg;
uint16 waitingFor;