diff --git a/polymer/eduke32/source/jmact/animlib.c b/polymer/eduke32/source/jmact/animlib.c index 2d5a547e9..3121037be 100644 --- a/polymer/eduke32/source/jmact/animlib.c +++ b/polymer/eduke32/source/jmact/animlib.c @@ -295,7 +295,7 @@ void ANIM_LoadAnim(char * buffer) // theoretically we should be able to play files with more than 256 frames now // assuming the utilities to create them can make them that way - for (i = anim->lpheader->nLps-1; i != 0; i--) + for (i = 0; i < anim->lpheader->nLps; i++) { anim->LpArray[i].baseRecord = B_LITTLE16(anim->LpArray[i].baseRecord); anim->LpArray[i].nRecords = B_LITTLE16(anim->LpArray[i].nRecords); diff --git a/polymer/eduke32/source/menus.c b/polymer/eduke32/source/menus.c index bd772ebe4..e521e078e 100644 --- a/polymer/eduke32/source/menus.c +++ b/polymer/eduke32/source/menus.c @@ -306,7 +306,7 @@ int32_t menutext_(int32_t x,int32_t y,int32_t s,int32_t p,char *t,int32_t bits) ac = BIGCOMMA; break; case '!': - ac = BIGX; + ac = BIGX_; break; case '?': ac = BIGQ; @@ -359,7 +359,7 @@ int32_t menutext_(int32_t x,int32_t y,int32_t s,int32_t p,char *t,int32_t bits) ac = BIGCOMMA; break; case '!': - ac = BIGX; + ac = BIGX_; break; case '\'': ac = BIGAPPOS; diff --git a/polymer/eduke32/source/namesdyn.c b/polymer/eduke32/source/namesdyn.c index a30309a90..86e6a9f60 100644 --- a/polymer/eduke32/source/namesdyn.c +++ b/polymer/eduke32/source/namesdyn.c @@ -620,7 +620,7 @@ static struct dynitem list[]= { "BIGALPHANUM", DVPTR(BIGALPHANUM), BIGALPHANUM__STATIC }, { "BIGPERIOD", DVPTR(BIGPERIOD), BIGPERIOD__STATIC }, { "BIGCOMMA", DVPTR(BIGCOMMA), BIGCOMMA__STATIC }, - { "BIGX", DVPTR(BIGX), BIGX__STATIC }, + { "BIGX", DVPTR(BIGX_), BIGX__STATIC }, { "BIGQ", DVPTR(BIGQ), BIGQ__STATIC }, { "BIGSEMI", DVPTR(BIGSEMI), BIGSEMI__STATIC }, { "BIGCOLIN", DVPTR(BIGCOLIN), BIGCOLIN__STATIC }, @@ -1364,7 +1364,8 @@ int32_t ENDALPHANUM = ENDALPHANUM__STATIC; int32_t BIGALPHANUM = BIGALPHANUM__STATIC; int32_t BIGPERIOD = BIGPERIOD__STATIC; int32_t BIGCOMMA = BIGCOMMA__STATIC; -int32_t BIGX = BIGX__STATIC; +// "BIGX" clashes on the Wii? +int32_t BIGX_ = BIGX__STATIC; int32_t BIGQ = BIGQ__STATIC; int32_t BIGSEMI = BIGSEMI__STATIC; int32_t BIGCOLIN = BIGCOLIN__STATIC; diff --git a/polymer/eduke32/source/namesdyn.h b/polymer/eduke32/source/namesdyn.h index a4d4f5a8a..dbe769b52 100644 --- a/polymer/eduke32/source/namesdyn.h +++ b/polymer/eduke32/source/namesdyn.h @@ -1347,7 +1347,7 @@ extern int32_t ENDALPHANUM; extern int32_t BIGALPHANUM; extern int32_t BIGPERIOD; extern int32_t BIGCOMMA; -extern int32_t BIGX; +extern int32_t BIGX_; extern int32_t BIGQ; extern int32_t BIGSEMI; extern int32_t BIGCOLIN;