diff options
Diffstat (limited to 'engines/griffon/engine.cpp')
| -rw-r--r-- | engines/griffon/engine.cpp | 3191 |
1 files changed, 1572 insertions, 1619 deletions
diff --git a/engines/griffon/engine.cpp b/engines/griffon/engine.cpp index 6ced3674e4..228b5d1bd5 100644 --- a/engines/griffon/engine.cpp +++ b/engines/griffon/engine.cpp @@ -30,7 +30,7 @@ #include "config.h" #include "state.h" -// memo +// memo /* in game scripts 2 - find master key @@ -102,7 +102,7 @@ int itemselon, curitem, itemticks; float itemyloc; int selenemyon, curenemy, forcepause; int roomlock; // set to disable any room jumps while in the room -int scriptflag[100][10], saveslot; // script, flag +int scriptflag[100][10], saveslot; // script, flag // timer related - move to local later int ticks, tickspassed, nextticks; @@ -117,7 +117,7 @@ extern char *story2[27]; SDL_Rect rcSrc, rcDest; // -----------special case -int dontdrawover; // used in map24 so that the candles dont draw over the boss, default set to 0 +int dontdrawover; // used in map24 so that the candles dont draw over the boss, default set to 0 // saveload info SDL_Surface *saveloadimg; @@ -151,11 +151,11 @@ extern int elementmap[15][20]; // animation info SDL_Surface *anims[100]; - // id number 0&1 = players +// id number 0&1 = players SDL_Surface *animsa[100]; - // attack anims +// attack anims float playerattackofs[4][16][3]; - // [dir] [frame] [x,y ofs, completed(0/1)] +// [dir] [frame] [x,y ofs, completed(0/1)] float floattext[MAXFLOAT][4]; // [id] [framesleft, x, y, col] char *floatstri[MAXFLOAT]; @@ -167,20 +167,20 @@ ANIMSET2TYPE animset2[7], animset9[7]; // object info float objectframe[256][2]; int lastobj; - // frame!, curframe +// frame!, curframe int objectinfo[33][6]; - // nframes,xtiles,ytiles,speed,type,script, update? +// nframes,xtiles,ytiles,speed,type,script, update? int objecttile[33][9][3][3][2]; - // [objnum] [frame] [x] [y] [tile/layer] +// [objnum] [frame] [x] [y] [tile/layer] int objmap[21][15]; int objmapf[1000][21][15]; - // [mapnum] x, y set to 1 to make this objmap spot stay at -1 +// [mapnum] x, y set to 1 to make this objmap spot stay at -1 // trigger info int triggers[10000][9]; - // [map#][index], [var] - // map#,x,y +// [map#][index], [var] +// map#,x,y int triggerloc[320][240], ntriggers; // npc info @@ -189,7 +189,7 @@ int lastnpc; // music info Mix_Chunk *mgardens, *mgardens2, *mgardens3, *mgardens4, *mboss, *mmenu, *mendofgame; -int menabled=1, musicchannel = -1, menuchannel = -1; +int menabled = 1, musicchannel = -1, menuchannel = -1; int pgardens, pboss, ptown, pacademy, pcitadel; int loopseta = 0; @@ -205,8 +205,7 @@ int ysort[2401], lasty, firsty; int pmenu; #undef main -int main() -{ +int main() { sys_initialize(); game_showlogos(); game_main(); @@ -216,21 +215,21 @@ int main() // element tile locations int elementmap[15][20] = { - { 2, 2, 2, 2,-1,-1,-1, 2, 2, 2, 2, 2, 2,-1,-1,-1,-1,-1,-1,-1 }, - { 2,-1,-1,-1,-1,-1,-1, 2, 2, 2, 2, 2, 2,-1,-1,-1,-1,-1,-1,-1 }, - { 2,-1, 2, 2,-1,-1,-1, 2, 2, 2, 2, 2, 2,-1,-1,-1,-1,-1,-1,-1 }, - { 2,-1, 2,-1, 2,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 }, - { 2, 2, 2, 2, 2,-1,-1,-1, 2,-1,-1, 2,-1,-1,-1,-1,-1,-1,-1,-1 }, - { -1,-1,-1,-1, 2,-1, 0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 }, - { -1,-1,-1,-1,-1, 0, 0, 2, 2, 2,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 }, - { -1,-1,-1,-1,-1, 2, 2, 2, 2, 2,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 }, - { -1,-1,-1,-1,-1, 2, 2, 2, 2, 2,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 }, - { -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 }, - { -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 }, - { -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 }, - { -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 }, - { -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 }, - { -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 } + { 2, 2, 2, 2, -1, -1, -1, 2, 2, 2, 2, 2, 2, -1, -1, -1, -1, -1, -1, -1 }, + { 2, -1, -1, -1, -1, -1, -1, 2, 2, 2, 2, 2, 2, -1, -1, -1, -1, -1, -1, -1 }, + { 2, -1, 2, 2, -1, -1, -1, 2, 2, 2, 2, 2, 2, -1, -1, -1, -1, -1, -1, -1 }, + { 2, -1, 2, -1, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }, + { 2, 2, 2, 2, 2, -1, -1, -1, 2, -1, -1, 2, -1, -1, -1, -1, -1, -1, -1, -1 }, + { -1, -1, -1, -1, 2, -1, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }, + { -1, -1, -1, -1, -1, 0, 0, 2, 2, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }, + { -1, -1, -1, -1, -1, 2, 2, 2, 2, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }, + { -1, -1, -1, -1, -1, 2, 2, 2, 2, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }, + { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }, + { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }, + { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }, + { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }, + { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }, + { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 } }; char *story[48] = { @@ -318,73 +317,72 @@ char *story2[27] = { int invmap[4][7][13] = { // map 0 { - {0,0,0,0,0,0,0,0,0,0,0,0,0}, - {0,0,0,0,0,0,0,0,0,0,0,0,0}, - {0,0,0,0,0,43,44,45,46,0,0,0,0}, - {0,0,0,0,0,42,0,0,0,0,0,0,0}, - {0,0,0,0,3,2,0,0,0,0,0,0,0}, - {0,0,0,0,4,5,0,0,0,0,0,0,0}, - {0,0,0,0,0,0,0,0,0,0,0,0,0} + {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + {0, 0, 0, 0, 0, 43, 44, 45, 46, 0, 0, 0, 0}, + {0, 0, 0, 0, 0, 42, 0, 0, 0, 0, 0, 0, 0}, + {0, 0, 0, 0, 3, 2, 0, 0, 0, 0, 0, 0, 0}, + {0, 0, 0, 0, 4, 5, 0, 0, 0, 0, 0, 0, 0}, + {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} }, // map 1 { - {0,0,0,0,0,0,0,0,0,0,0,0,0}, - {0,0,0,24,0,0,0,0,0,0,0,0,0}, - {0,0,19,20,21,22,0,0,0,27,0,0,0}, - {0,0,16,17,18,0,0,0,29,30,31,0,0}, - {0,0,12,0,13,14,0,32,33,34,35,36,0}, - {0,8,7,6,9,10,0,37,38,39,40,41,0}, - {0,0,0,0,0,0,0,0,0,0,0,0,0} + {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + {0, 0, 0, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + {0, 0, 19, 20, 21, 22, 0, 0, 0, 27, 0, 0, 0}, + {0, 0, 16, 17, 18, 0, 0, 0, 29, 30, 31, 0, 0}, + {0, 0, 12, 0, 13, 14, 0, 32, 33, 34, 35, 36, 0}, + {0, 8, 7, 6, 9, 10, 0, 37, 38, 39, 40, 41, 0}, + {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} }, // map 2 { - {0,0,0,0,0,0,67,0,0,0,0,0,0}, - {0,0,0,0,0,0,66,0,0,0,0,0,0}, - {0,0,0,0,0,63,64,65,0,0,0,0,0}, - {0,0,0,0,58,59,60,61,62,0,0,0,0}, - {0,0,0,0,0,55,56,57,0,0,0,0,0}, - {0,0,0,0,50,51,52,53,54,0,0,0,0}, - {0,0,0,0,0,48,47,49,0,0,0,0,0} + {0, 0, 0, 0, 0, 0, 67, 0, 0, 0, 0, 0, 0}, + {0, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0}, + {0, 0, 0, 0, 0, 63, 64, 65, 0, 0, 0, 0, 0}, + {0, 0, 0, 0, 58, 59, 60, 61, 62, 0, 0, 0, 0}, + {0, 0, 0, 0, 0, 55, 56, 57, 0, 0, 0, 0, 0}, + {0, 0, 0, 0, 50, 51, 52, 53, 54, 0, 0, 0, 0}, + {0, 0, 0, 0, 0, 48, 47, 49, 0, 0, 0, 0, 0} }, // map 3 { - {0,0,0,0,0,0,0,0,0,0,0,0,0}, - {0,0,0,82,0,0,0,0,0,0,0,0,0}, - {0,0,0,79,80,81,0,74,72,0,0,0,0}, - {0,0,0,78,0,0,0,73,70,69,68,0,0}, - {0,0,77,76,75,0,0,0,71,0,0,0,0}, - {0,0,0,0,0,0,0,0,0,0,0,0,0}, - {0,0,0,0,0,0,0,0,0,0,0,0,0} + {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + {0, 0, 0, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + {0, 0, 0, 79, 80, 81, 0, 74, 72, 0, 0, 0, 0}, + {0, 0, 0, 78, 0, 0, 0, 73, 70, 69, 68, 0, 0}, + {0, 0, 77, 76, 75, 0, 0, 0, 71, 0, 0, 0, 0}, + {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} } }; // HELPER MACRO --------------------------------------------------------------- -#define PRINT(A,B) \ -do { \ - char line[256]; \ - sprintf(line, A "\n", B); \ - fputs(line, fp); \ -} while(0) - -#define INPUT(A, B) \ -do { \ - char line[256]; \ - fgets(line, sizeof(line), fp); \ - sscanf(line, A, B); \ -} while(0) +#define PRINT(A,B) \ + do { \ + char line[256]; \ + sprintf(line, A "\n", B); \ + fputs(line, fp); \ + } while(0) + +#define INPUT(A, B) \ + do { \ + char line[256]; \ + fgets(line, sizeof(line), fp); \ + sscanf(line, A, B); \ + } while(0) // CODE GOES HERE ------------------------------------------------------------- #ifdef OPENDINGUX - #define SDL_BLITVIDEO(X, Y, C, F) SDL_BlitSurface((X), (Y), (C), (F)) +#define SDL_BLITVIDEO(X, Y, C, F) SDL_BlitSurface((X), (Y), (C), (F)) #else - #define SDL_BLITVIDEO(X, Y, C, F) sdl_blitscale((X), (Y), (C), NULL) +#define SDL_BLITVIDEO(X, Y, C, F) sdl_blitscale((X), (Y), (C), NULL) #endif -void sdl_blitscale(SDL_Surface *src, SDL_Rect *srcrect, SDL_Surface *dst, SDL_Rect *dstrect) -{ - if(src->w != dst->w) { +void sdl_blitscale(SDL_Surface *src, SDL_Rect *srcrect, SDL_Surface *dst, SDL_Rect *dstrect) { + if (src->w != dst->w) { SDL_Surface *scale2x = NULL; scale2x = zoomSurface(src, 2, 2, 0); @@ -396,8 +394,7 @@ void sdl_blitscale(SDL_Surface *src, SDL_Rect *srcrect, SDL_Surface *dst, SDL_Re } -void game_fillrect(SDL_Surface *surface, int x, int y, int w, int h, int color) -{ +void game_fillrect(SDL_Surface *surface, int x, int y, int w, int h, int color) { SDL_Rect src; src.x = x; @@ -409,16 +406,14 @@ void game_fillrect(SDL_Surface *surface, int x, int y, int w, int h, int color) } // copypaste from hRnd_CRT() -static float RND() -{ +static float RND() { /* return between 0 and 1 (but never 1) */ return (float)rand() * (1.0 / ((float)RAND_MAX + 1.0)); } -void game_addFloatIcon(int ico, float xloc, float yloc) -{ - for(int i = 0; i < MAXFLOAT; i++) { - if(floaticon[i][0] == 0) { +void game_addFloatIcon(int ico, float xloc, float yloc) { + for (int i = 0; i < MAXFLOAT; i++) { + if (floaticon[i][0] == 0) { floaticon[i][0] = 32; floaticon[i][1] = xloc; floaticon[i][2] = yloc; @@ -428,10 +423,9 @@ void game_addFloatIcon(int ico, float xloc, float yloc) } } -void game_addFloatText(char *stri, float xloc, float yloc, int col) -{ - for(int i = 0; i < MAXFLOAT; i++) { - if(floattext[i][0] == 0) { +void game_addFloatText(char *stri, float xloc, float yloc, int col) { + for (int i = 0; i < MAXFLOAT; i++) { + if (floattext[i][0] == 0) { floattext[i][0] = 32; floattext[i][1] = xloc; floattext[i][2] = yloc; @@ -442,8 +436,7 @@ void game_addFloatText(char *stri, float xloc, float yloc, int col) } } -void game_attack() -{ +void game_attack() { float npx, npy; npx = player.px + 12; @@ -453,38 +446,38 @@ void game_attack() int ly = (int)npy / 16; // if facing up - if(player.walkdir == 0) { - if(ly > 0) { + if (player.walkdir == 0) { + if (ly > 0) { int o2 = 0; // ?? int o = objmap[lx][ly - 1]; - if(ly > 1 && curmap == 58) o2 = objmap[lx][ly - 2]; - if(ly > 1 && curmap == 54) o2 = objmap[lx][ly - 2]; + if (ly > 1 && curmap == 58) o2 = objmap[lx][ly - 2]; + if (ly > 1 && curmap == 54) o2 = objmap[lx][ly - 2]; // cst - if((objectinfo[o][4] == 1 && (o == 0 || o > 4)) || (objectinfo[o2][4] == 0 && o2 == 10)) { - if(o2 == 10) o = 10; + if ((objectinfo[o][4] == 1 && (o == 0 || o > 4)) || (objectinfo[o2][4] == 0 && o2 == 10)) { + if (o2 == 10) o = 10; int oscript = objectinfo[o][5]; - if(oscript == 0 && player.inventory[INV_FLASK] < 9) { + if (oscript == 0 && player.inventory[INV_FLASK] < 9) { player.inventory[INV_FLASK]++; game_addFloatIcon(6, lx * 16, (ly - 1) * 16); objmapf[curmap][lx][ly - 1] = 1; - if(menabled == 1 && config.effects == 1) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndpowerup], 0); Mix_Volume(snd, config.effectsvol); } - if(objectinfo[o][4] == 1) objmap[lx][ly - 1] = 3; + if (objectinfo[o][4] == 1) objmap[lx][ly - 1] = 3; game_eventtext("Found Flask!"); itemticks = ticks + 215; return; } - if(oscript == 0 && player.inventory[INV_FLASK] == 9) { - if(menabled == 1 && config.effects == 1) { + if (oscript == 0 && player.inventory[INV_FLASK] == 9) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndchest], 0); Mix_Volume(snd, config.effectsvol); } @@ -494,104 +487,104 @@ void game_attack() return; } - if(oscript == 2) { + if (oscript == 2) { player.inventory[INV_MASTERKEY]++; game_addFloatIcon(14, lx * 16, (ly - 1) * 16); itemticks = ticks + 215; - if(curmap == 34) scriptflag[2][0] = 2; - if(curmap == 62) scriptflag[8][0] = 2; - if(curmap == 81) scriptflag[13][0] = 2; + if (curmap == 34) scriptflag[2][0] = 2; + if (curmap == 62) scriptflag[8][0] = 2; + if (curmap == 81) scriptflag[13][0] = 2; - if(menabled == 1 && config.effects == 1) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndpowerup], 0); Mix_Volume(snd, config.effectsvol); } - if(objectinfo[o][4] == 1) objmap[lx][ly - 1] = 3; + if (objectinfo[o][4] == 1) objmap[lx][ly - 1] = 3; game_eventtext("Found the Temple Key!"); return; } - if(oscript == 3) { + if (oscript == 3) { player.foundspell[0] = 1; player.spellcharge[0] = 0; game_addFloatIcon(7, lx * 16, (ly - 1) * 16); - if(menabled == 1 && config.effects == 1) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndpowerup], 0); Mix_Volume(snd, config.effectsvol); } - if(objectinfo[o][4] == 1) objmap[lx][ly - 1] = 3; + if (objectinfo[o][4] == 1) objmap[lx][ly - 1] = 3; game_eventtext("Found the Infinite Crystal!"); itemticks = ticks + 215; return; } - if(oscript == 4 && player.shield == 1) { + if (oscript == 4 && player.shield == 1) { player.shield = 2; game_addFloatIcon(4, lx * 16, (ly - 1) * 16); itemticks = ticks + 215; - if(menabled == 1 && config.effects == 1) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndpowerup], 0); Mix_Volume(snd, config.effectsvol); } - if(objectinfo[o][4] == 1) objmap[lx][ly - 1] = 3; + if (objectinfo[o][4] == 1) objmap[lx][ly - 1] = 3; game_eventtext("Found the Obsidian Shield!"); objmapf[4][1][2] = 1; return; } - if(oscript == 5 && player.sword == 1) { + if (oscript == 5 && player.sword == 1) { player.sword = 2; game_addFloatIcon(3, lx * 16, (ly - 1) * 16); itemticks = ticks + 215; - if(menabled == 1 && config.effects == 1) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndpowerup], 0); Mix_Volume(snd, config.effectsvol); } - if(objectinfo[o][4] == 1) objmap[lx][ly - 1] = 3; + if (objectinfo[o][4] == 1) objmap[lx][ly - 1] = 3; game_eventtext("Found the Fidelis Sword!"); return; } - if(oscript == 6) { - if(player.inventory[INV_NORMALKEY] < 9) { + if (oscript == 6) { + if (player.inventory[INV_NORMALKEY] < 9) { player.inventory[INV_NORMALKEY]++; - for(int s = 20; s <= 23; s++) { - if(scriptflag[s][0] == 1) { + for (int s = 20; s <= 23; s++) { + if (scriptflag[s][0] == 1) { scriptflag[s][0] = 2; } } - if(menabled == 1 && config.effects == 1) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndpowerup], 0); Mix_Volume(snd, config.effectsvol); } objmapf[curmap][lx][ly - 1] = 1; - if(objectinfo[o][4] == 1) objmap[lx][ly - 1] = 3; + if (objectinfo[o][4] == 1) objmap[lx][ly - 1] = 3; game_eventtext("Found Key"); game_addFloatIcon(16, lx * 16, (ly - 1) * 16); } else { - if(menabled == 1 && config.effects == 1) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndchest], 0); Mix_Volume(snd, config.effectsvol); } @@ -600,26 +593,26 @@ void game_attack() } } - if(oscript == 7 && player.inventory[INV_DOUBLEFLASK] < 9) { + if (oscript == 7 && player.inventory[INV_DOUBLEFLASK] < 9) { player.inventory[INV_DOUBLEFLASK]++; game_addFloatIcon(12, lx * 16, (ly - 1) * 16); objmapf[curmap][lx][ly - 1] = 1; - if(menabled == 1 && config.effects == 1) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndpowerup], 0); Mix_Volume(snd, config.effectsvol); } - if(objectinfo[o][4] == 1) objmap[lx][ly - 1] = 3; + if (objectinfo[o][4] == 1) objmap[lx][ly - 1] = 3; game_eventtext("Found Mega Flask!"); itemticks = ticks + 215; return; } - if(oscript == 7 && player.inventory[INV_DOUBLEFLASK] == 9) { - if(menabled == 1 && config.effects == 1) { + if (oscript == 7 && player.inventory[INV_DOUBLEFLASK] == 9) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndchest], 0); Mix_Volume(snd, config.effectsvol); } @@ -629,26 +622,26 @@ void game_attack() return; } - if(oscript == 10 && player.inventory[INV_DOUBLEFLASK] < 9) { + if (oscript == 10 && player.inventory[INV_DOUBLEFLASK] < 9) { player.inventory[INV_DOUBLEFLASK]++; game_addFloatIcon(12, lx * 16, (ly - 1) * 16); objmapf[curmap][lx][ly - 1] = 1; - if(menabled == 1 && config.effects == 1) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndpowerup], 0); Mix_Volume(snd, config.effectsvol); } - if(objectinfo[o][4] == 1) objmap[lx][ly - 1] = 3; + if (objectinfo[o][4] == 1) objmap[lx][ly - 1] = 3; game_eventtext("Found Mega Flask!"); itemticks = ticks + 215; return; } - if(oscript == 10 && player.inventory[INV_DOUBLEFLASK] == 9) { - if(menabled == 1 && config.effects == 1) { + if (oscript == 10 && player.inventory[INV_DOUBLEFLASK] == 9) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndchest], 0); Mix_Volume(snd, config.effectsvol); } @@ -658,26 +651,26 @@ void game_attack() return; } - if(oscript == 11 && player.inventory[INV_SHOCK] < 9) { + if (oscript == 11 && player.inventory[INV_SHOCK] < 9) { player.inventory[INV_SHOCK]++; game_addFloatIcon(17, lx * 16, (ly - 1) * 16); objmapf[curmap][lx][ly - 1] = 1; - if(menabled == 1 && config.effects == 1) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndpowerup], 0); Mix_Volume(snd, config.effectsvol); } - if(objectinfo[o][4] == 1) objmap[lx][ly - 1] = 3; + if (objectinfo[o][4] == 1) objmap[lx][ly - 1] = 3; game_eventtext("Found Lightning Bomb!"); itemticks = ticks + 215; return; } - if(oscript == 11 && player.inventory[INV_SHOCK] == 9) { - if(menabled == 1 && config.effects == 1) { + if (oscript == 11 && player.inventory[INV_SHOCK] == 9) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndchest], 0); Mix_Volume(snd, config.effectsvol); } @@ -687,34 +680,34 @@ void game_attack() return; } - if(oscript == 12 && player.armour == 1) { + if (oscript == 12 && player.armour == 1) { player.armour = 2; game_addFloatIcon(5, lx * 16, (ly - 1) * 16); - if(menabled == 1 && config.effects == 1) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndpowerup], 0); Mix_Volume(snd, config.effectsvol); } - if(objectinfo[o][4] == 1) objmap[lx][ly - 1] = 3; + if (objectinfo[o][4] == 1) objmap[lx][ly - 1] = 3; game_eventtext("Found the Fidelis Mail!"); itemticks = ticks + 215; return; } - if(oscript == 60) { - if(curmap == 58 && scriptflag[60][0] == 0) { + if (oscript == 60) { + if (curmap == 58 && scriptflag[60][0] == 0) { scriptflag[60][0] = 1; - if(menabled == 1 && config.effects == 1) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndlever], 0); Mix_Volume(snd, config.effectsvol); } - } else if(curmap == 58 && scriptflag[60][0] > 0) { - if(menabled == 1 && config.effects == 1) { + } else if (curmap == 58 && scriptflag[60][0] > 0) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[snddoor], 0); Mix_Volume(snd, config.effectsvol); } @@ -722,15 +715,15 @@ void game_attack() game_eventtext("It's stuck!"); } - if(curmap == 54 && scriptflag[60][0] == 1) { - if(menabled == 1 && config.effects == 1) { + if (curmap == 54 && scriptflag[60][0] == 1) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndlever], 0); Mix_Volume(snd, config.effectsvol); } scriptflag[60][0] = 2; - } else if(curmap == 54 && scriptflag[60][0] > 1) { - if(menabled == 1 && config.effects == 1) { + } else if (curmap == 54 && scriptflag[60][0] > 1) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[snddoor], 0); Mix_Volume(snd, config.effectsvol); } @@ -740,51 +733,51 @@ void game_attack() } - if(oscript == 15 && player.sword < 3) { + if (oscript == 15 && player.sword < 3) { player.sword = 3; game_addFloatIcon(18, lx * 16, (ly - 1) * 16); itemticks = ticks + 215; - if(menabled == 1 && config.effects == 1) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndpowerup], 0); Mix_Volume(snd, config.effectsvol); } - if(objectinfo[o][4] == 1) objmap[lx][ly - 1] = 3; + if (objectinfo[o][4] == 1) objmap[lx][ly - 1] = 3; game_eventtext("Found the Blood Sword!"); objmapf[4][1][2] = 1; return; } - if(oscript == 16 && player.shield < 3) { + if (oscript == 16 && player.shield < 3) { player.shield = 3; game_addFloatIcon(19, lx * 16, (ly - 1) * 16); itemticks = ticks + 215; - if(menabled == 1 && config.effects == 1) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndpowerup], 0); Mix_Volume(snd, config.effectsvol); } - if(objectinfo[o][4] == 1) objmap[lx][ly - 1] = 3; + if (objectinfo[o][4] == 1) objmap[lx][ly - 1] = 3; game_eventtext("Found the Entropy Shield!"); objmapf[4][1][2] = 1; return; } - if(oscript == 17 && player.armour < 3) { + if (oscript == 17 && player.armour < 3) { player.armour = 3; game_addFloatIcon(20, lx * 16, (ly - 1) * 16); itemticks = ticks + 215; - if(menabled == 1 && config.effects == 1) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndpowerup], 0); Mix_Volume(snd, config.effectsvol); } - if(objectinfo[o][4] == 1) objmap[lx][ly - 1] = 3; + if (objectinfo[o][4] == 1) objmap[lx][ly - 1] = 3; game_eventtext("Found the Rubyscale Armour!"); objmapf[4][1][2] = 1; return; @@ -801,19 +794,18 @@ void game_attack() movingleft = 0; movingright = 0; - for(int i = 0; i <= 15; i++) { - for(int a = 0; a <= 3; a++) { + for (int i = 0; i <= 15; i++) { + for (int a = 0; a <= 3; a++) { playerattackofs[a][i][2] = 0; } } } -void game_castspell(int spellnum, float homex, float homey, float enemyx, float enemyy, int damagewho) -{ +void game_castspell(int spellnum, float homex, float homey, float enemyx, float enemyy, int damagewho) { // spellnum 7 = sprite 6 spitfire - for(int i = 0; i < MAXSPELL; i++) { - if(spellinfo[i].frame == 0) { + for (int i = 0; i < MAXSPELL; i++) { + if (spellinfo[i].frame == 0) { spellinfo[i].homex = homex; spellinfo[i].homey = homey; spellinfo[i].enemyx = enemyx; @@ -821,7 +813,7 @@ void game_castspell(int spellnum, float homex, float homey, float enemyx, float spellinfo[i].spellnum = spellnum; int dw = 0; int npc = 0; - if(damagewho > 0) { + if (damagewho > 0) { dw = 1; npc = damagewho; } @@ -830,14 +822,14 @@ void game_castspell(int spellnum, float homex, float homey, float enemyx, float spellinfo[i].npc = npc; spellinfo[i].frame = 32; - if(damagewho == 0) { + if (damagewho == 0) { spellinfo[i].strength = player.spellstrength / 100; - if(player.spellstrength == 100) spellinfo[i].strength = 1.5; + if (player.spellstrength == 100) spellinfo[i].strength = 1.5; } // set earthslide vars - if(spellnum == 2) { - for(int f = 0; f <= 8; f++) { + if (spellnum == 2) { + for (int f = 0; f <= 8; f++) { spellinfo[i].rocky[f] = 0; spellinfo[i].rockimg[f] = (int)(RND() * 4); spellinfo[i].rockdeflect[f] = ((int)(RND() * 128) - 64) * 1.5; @@ -845,19 +837,19 @@ void game_castspell(int spellnum, float homex, float homey, float enemyx, float } // set fire vars - if(spellnum == 3) { - for(int f = 0; f <= 4; f++) { + if (spellnum == 3) { + for (int f = 0; f <= 4; f++) { spellinfo[i].legalive[f] = 32; } } // room fireball vars - if(spellnum == 6) { + if (spellnum == 6) { int nballs = 0; - for(int x = 0; x <= 19; x++) { - for(int y = 0; y <= 14; y++) { - if((objmap[x][y] == 1 || objmap[x][y] == 2) && nballs < 5 && (int)(RND() * 4) == 0) { + for (int x = 0; x <= 19; x++) { + for (int y = 0; y <= 14; y++) { + if ((objmap[x][y] == 1 || objmap[x][y] == 2) && nballs < 5 && (int)(RND() * 4) == 0) { int ax = x * 16; int ay = y * 16; @@ -874,14 +866,14 @@ void game_castspell(int spellnum, float homex, float homey, float enemyx, float spellinfo[i].nfballs = nballs; } - if(menabled == 1 && config.effects == 1) { - if(spellnum == 1) { + if (menabled == 1 && config.effects == 1) { + if (spellnum == 1) { int snd = Mix_PlayChannel(-1, sfx[sndthrow], 0); Mix_Volume(snd, config.effectsvol); - } else if(spellnum == 5) { + } else if (spellnum == 5) { int snd = Mix_PlayChannel(-1, sfx[sndcrystal], 0); Mix_Volume(snd, config.effectsvol); - } else if(spellnum == 8 || spellnum == 9) { + } else if (spellnum == 8 || spellnum == 9) { int snd = Mix_PlayChannel(-1, sfx[sndlightning], 0); Mix_Volume(snd, config.effectsvol); } @@ -892,14 +884,13 @@ void game_castspell(int spellnum, float homex, float homey, float enemyx, float } } -void game_checkhit() -{ +void game_checkhit() { float npx, npy; float damage; - if(attacking == 1) { - for(int i = 1; i <= lastnpc; i++) { - if(npcinfo[i].hp > 0 && npcinfo[i].pause < ticks && (int)(RND() * 2) == 0) { + if (attacking == 1) { + for (int i = 1; i <= lastnpc; i++) { + if (npcinfo[i].hp > 0 && npcinfo[i].pause < ticks && (int)(RND() * 2) == 0) { npx = npcinfo[i].x; npy = npcinfo[i].y; @@ -907,36 +898,35 @@ void game_checkhit() float ydif = player.py - npy; float ps = player.sword; - if(ps > 1) ps = ps * 0.75; - damage = (float)player.sworddamage * (1.0 + RND() * 1.0) * player.attackstrength / 100.0 * ps; - if(player.attackstrength == 100) damage = damage * 1.5; - - int hit = 0; - if(player.walkdir == 0) { - if(abs(xdif) <= 8 && ydif >= 0 && ydif < 8) hit = 1; - } else if(player.walkdir == 1) { - if(abs(xdif) <= 8 && ydif <= 0 && ydif > -8) hit = 1; - } else if(player.walkdir == 2) { - if(abs(ydif) <= 8 && xdif >= -8 && xdif < 8) hit = 1; - } else if(player.walkdir == 3) { - if(abs(ydif) <= 8 && xdif <= 8 && xdif > -8) hit = 1; - } - - if(hit == 1) { - if(menabled == 1 && config.effects == 1) { - int snd = Mix_PlayChannel(-1, sfx[sndswordhit], 0); - Mix_Volume(snd, config.effectsvol); - } + if (ps > 1) ps = ps * 0.75; + damage = (float)player.sworddamage * (1.0 + RND() * 1.0) * player.attackstrength / 100.0 * ps; + if (player.attackstrength == 100) damage = damage * 1.5; + + int hit = 0; + if (player.walkdir == 0) { + if (abs(xdif) <= 8 && ydif >= 0 && ydif < 8) hit = 1; + } else if (player.walkdir == 1) { + if (abs(xdif) <= 8 && ydif <= 0 && ydif > -8) hit = 1; + } else if (player.walkdir == 2) { + if (abs(ydif) <= 8 && xdif >= -8 && xdif < 8) hit = 1; + } else if (player.walkdir == 3) { + if (abs(ydif) <= 8 && xdif <= 8 && xdif > -8) hit = 1; + } - game_damagenpc(i, damage, 0); + if (hit == 1) { + if (menabled == 1 && config.effects == 1) { + int snd = Mix_PlayChannel(-1, sfx[sndswordhit], 0); + Mix_Volume(snd, config.effectsvol); } + + game_damagenpc(i, damage, 0); + } } } } } -void game_checkinputs() -{ +void game_checkinputs() { int ntickdelay; ntickdelay = 175; @@ -946,15 +936,15 @@ void game_checkinputs() nposts = 0; - for(int i = 0; i <= 20; i++) { + for (int i = 0; i <= 20; i++) { postinfo[i][0] = 0; postinfo[i][1] = 0; } - for(int x = 0; x <= 19; x++) { - for(int y = 0; y <= 14; y++) { + for (int x = 0; x <= 19; x++) { + for (int y = 0; y <= 14; y++) { int o = objmap[x][y]; - if(objectinfo[o][4] == 3) { + if (objectinfo[o][4] == 3) { postinfo[nposts][0] = x * 16; postinfo[nposts][1] = y * 16; nposts = nposts + 1; @@ -962,16 +952,16 @@ void game_checkinputs() } } - if(attacking == 1 || (forcepause == 1 && itemselon == 0)) return; + if (attacking == 1 || (forcepause == 1 && itemselon == 0)) return; - if(event.type == SDL_KEYDOWN) { - switch(event.key.keysym.sym) { + if (event.type == SDL_KEYDOWN) { + switch (event.key.keysym.sym) { case SDLK_ESCAPE: - if(itemticks < ticks) game_title(1); + if (itemticks < ticks) game_title(1); break; case SDLK_RETURN: - if(keys[SDLK_LALT] || keys[SDLK_RALT]) { - if(fullscreen & SDL_FULLSCREEN) { + if (keys[SDLK_LALT] || keys[SDLK_RALT]) { + if (fullscreen & SDL_FULLSCREEN) { fullscreen = config.hwaccel | config.hwsurface; } else { fullscreen = SDL_FULLSCREEN | config.hwaccel | config.hwsurface; @@ -985,16 +975,16 @@ void game_checkinputs() break; case SDLK_LCTRL: - if(itemselon == 0 && itemticks < ticks) game_attack(); + if (itemselon == 0 && itemticks < ticks) game_attack(); - if(itemselon == 1 && itemticks < ticks) { - if(curitem == 0 && player.inventory[INV_FLASK] > 0) { + if (itemselon == 1 && itemticks < ticks) { + if (curitem == 0 && player.inventory[INV_FLASK] > 0) { itemticks = ticks + ntickdelay; int heal = 50; int maxh = player.maxhp - player.hp; - if(heal > maxh) heal = maxh; + if (heal > maxh) heal = maxh; player.hp = player.hp + heal; @@ -1004,7 +994,7 @@ void game_checkinputs() player.inventory[INV_FLASK]--; - if(menabled == 1 && config.effects == 1) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndpowerup], 0); Mix_Volume(snd, config.effectsvol); } @@ -1013,13 +1003,13 @@ void game_checkinputs() forcepause = 0; } - if(curitem == 1 && player.inventory[INV_DOUBLEFLASK] > 0) { + if (curitem == 1 && player.inventory[INV_DOUBLEFLASK] > 0) { itemticks = ticks + ntickdelay; int heal = 200; int maxh = player.maxhp - player.hp; - if(heal > maxh) heal = maxh; + if (heal > maxh) heal = maxh; player.hp = player.hp + heal; @@ -1029,7 +1019,7 @@ void game_checkinputs() player.inventory[INV_DOUBLEFLASK]--; - if(menabled == 1 && config.effects == 1) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndpowerup], 0); Mix_Volume(snd, config.effectsvol); } @@ -1039,7 +1029,7 @@ void game_checkinputs() } - if(curitem == 2 && player.inventory[INV_SHOCK] > 0) { + if (curitem == 2 && player.inventory[INV_SHOCK] > 0) { game_castspell(8, player.px, player.py, npcinfo[curenemy].x, npcinfo[curenemy].y, 0); forcepause = 1; @@ -1052,7 +1042,7 @@ void game_checkinputs() } - if(curitem == 3 && player.inventory[INV_NORMALKEY] > 0 && canusekey == 1 && locktype == 1) { + if (curitem == 3 && player.inventory[INV_NORMALKEY] > 0 && canusekey == 1 && locktype == 1) { roomlocks[roomtounlock] = 0; game_eventtext("UnLocked!"); @@ -1064,7 +1054,7 @@ void game_checkinputs() return; } - if(curitem == 4 && player.inventory[INV_MASTERKEY] > 0 && canusekey == 1 && locktype == 2) { + if (curitem == 4 && player.inventory[INV_MASTERKEY] > 0 && canusekey == 1 && locktype == 2) { roomlocks[roomtounlock] = 0; game_eventtext("UnLocked!"); @@ -1076,7 +1066,7 @@ void game_checkinputs() return; } - if(curitem == 5 && player.spellcharge[0] == 100) { + if (curitem == 5 && player.spellcharge[0] == 100) { game_castspell(5, player.px, player.py, npcinfo[curenemy].x, npcinfo[curenemy].y, 0); player.spellcharge[0] = 0; @@ -1088,8 +1078,8 @@ void game_checkinputs() itemselon = 0; } - if(curitem > 5 && selenemyon == 1) { - if(curenemy <= lastnpc) { + if (curitem > 5 && selenemyon == 1) { + if (curenemy <= lastnpc) { game_castspell(curitem - 6, player.px, player.py, npcinfo[curenemy].x, npcinfo[curenemy].y, 0); } else { int pst = curenemy - lastnpc - 1; @@ -1106,27 +1096,27 @@ void game_checkinputs() forcepause = 0; } - if(curitem > 5 && selenemyon == 0 && itemselon == 1) { - if(player.spellcharge[curitem - 5] == 100) { + if (curitem > 5 && selenemyon == 0 && itemselon == 1) { + if (player.spellcharge[curitem - 5] == 100) { itemticks = ticks + ntickdelay; selenemyon = 1; int i = 0; do { - if(npcinfo[i].hp > 0) { + if (npcinfo[i].hp > 0) { curenemy = i; goto __exit_do; } i = i + 1; - if(i == lastnpc + 1) { + if (i == lastnpc + 1) { selenemyon = 0; goto __exit_do; } - } while(1); - __exit_do: + } while (1); +__exit_do: - if(nposts > 0 && selenemyon == 0) { + if (nposts > 0 && selenemyon == 0) { selenemyon = 1; curenemy = lastnpc + 1; } @@ -1137,9 +1127,9 @@ void game_checkinputs() break; case SDLK_LALT: - if(itemticks < ticks) { + if (itemticks < ticks) { selenemyon = 0; - if(itemselon == 1) { + if (itemselon == 1) { itemselon = 0; itemticks = ticks + 220; forcepause = 0; @@ -1157,82 +1147,81 @@ void game_checkinputs() } } - if(itemselon == 0) { + if (itemselon == 0) { movingup = 0; movingdown = 0; movingleft = 0; movingright = 0; - if(keys[SDLK_UP]) movingup = 1; - if(keys[SDLK_DOWN]) movingdown = 1; - if(keys[SDLK_LEFT]) movingleft = 1; - if(keys[SDLK_RIGHT]) movingright = 1; + if (keys[SDLK_UP]) movingup = 1; + if (keys[SDLK_DOWN]) movingdown = 1; + if (keys[SDLK_LEFT]) movingleft = 1; + if (keys[SDLK_RIGHT]) movingright = 1; } else { movingup = 0; movingdown = 0; movingleft = 0; movingright = 0; - if(selenemyon == 1) { - if(itemticks < ticks) { - if(keys[SDLK_LEFT]) { + if (selenemyon == 1) { + if (itemticks < ticks) { + if (keys[SDLK_LEFT]) { int origin = curenemy; do { curenemy = curenemy - 1; - if(curenemy < 1) curenemy = lastnpc + nposts; - if(curenemy == origin) break; - if(curenemy <= lastnpc && npcinfo[curenemy].hp > 0) break; - if(curenemy > lastnpc) break; - } while(1); + if (curenemy < 1) curenemy = lastnpc + nposts; + if (curenemy == origin) break; + if (curenemy <= lastnpc && npcinfo[curenemy].hp > 0) break; + if (curenemy > lastnpc) break; + } while (1); itemticks = ticks + ntickdelay; } - if(keys[SDLK_RIGHT]) { + if (keys[SDLK_RIGHT]) { int origin = curenemy; do { curenemy = curenemy + 1; - if(curenemy > lastnpc + nposts) curenemy = 1; - if(curenemy == origin) break; - if(curenemy <= lastnpc && npcinfo[curenemy].hp > 0) break; - if(curenemy > lastnpc) break; - } while(1); + if (curenemy > lastnpc + nposts) curenemy = 1; + if (curenemy == origin) break; + if (curenemy <= lastnpc && npcinfo[curenemy].hp > 0) break; + if (curenemy > lastnpc) break; + } while (1); itemticks = ticks + ntickdelay; } - if(curenemy > lastnpc + nposts) curenemy = 1; - if(curenemy < 1) curenemy = lastnpc + nposts; + if (curenemy > lastnpc + nposts) curenemy = 1; + if (curenemy < 1) curenemy = lastnpc + nposts; } } else { - if(itemticks < ticks) { - if(keys[SDLK_UP]) { + if (itemticks < ticks) { + if (keys[SDLK_UP]) { curitem = curitem - 1; itemticks = ticks + ntickdelay; - if(curitem == 4) curitem = 9; - if(curitem == -1) curitem = 4; + if (curitem == 4) curitem = 9; + if (curitem == -1) curitem = 4; } - if(keys[SDLK_DOWN]) { + if (keys[SDLK_DOWN]) { curitem = curitem + 1; itemticks = ticks + ntickdelay; - if(curitem == 5) curitem = 0; - if(curitem == 10) curitem = 5; + if (curitem == 5) curitem = 0; + if (curitem == 10) curitem = 5; } - if(keys[SDLK_LEFT]) { + if (keys[SDLK_LEFT]) { curitem = curitem - 5; itemticks = ticks + ntickdelay; } - if(keys[SDLK_RIGHT]) { + if (keys[SDLK_RIGHT]) { curitem = curitem + 5; itemticks = ticks + ntickdelay; } - if(curitem > 9) curitem = curitem - 10; - if(curitem < 0) curitem = curitem + 10; + if (curitem > 9) curitem = curitem - 10; + if (curitem < 0) curitem = curitem + 10; } } } } -void game_checktrigger() -{ +void game_checktrigger() { int npx, npy, lx, ly; npx = player.px + 12; @@ -1243,21 +1232,20 @@ void game_checktrigger() canusekey = 0; - if(triggerloc[lx][ly] > -1) game_processtrigger(triggerloc[lx][ly]); + if (triggerloc[lx][ly] > -1) game_processtrigger(triggerloc[lx][ly]); } #ifdef OPENDINGUX - #define MINCURSEL 7 - #define MAXCURSEL 14 - #define SY 22 +#define MINCURSEL 7 +#define MAXCURSEL 14 +#define SY 22 #else - #define MINCURSEL 0 - #define MAXCURSEL 14 - #define SY (38 + (240 - 38) / 2 - 88) +#define MINCURSEL 0 +#define MAXCURSEL 14 +#define SY (38 + (240 - 38) / 2 - 88) #endif -void game_configmenu() -{ +void game_configmenu() { SDL_Surface *configwindow; SDL_Rect rc; int cursel, curselt, ofullscreen; @@ -1301,7 +1289,7 @@ void game_configmenu() int sy = SY; - for(int i = 0; i <= 21; i++) { + for (int i = 0; i <= 21; i++) { static char *vr[22] = { #ifdef OPENDINGUX "", "", @@ -1336,43 +1324,43 @@ void game_configmenu() }; static char line[24]; - if(i == 15 || i == 17) { + if (i == 15 || i == 17) { int vol = (i == 15 ? config.musicvol : config.effectsvol) * 9 / 255; - if(vol < 0) vol = 0; - if(vol > 9) vol = 9; + if (vol < 0) vol = 0; + if (vol > 9) vol = 9; strcpy(line, "[----------]"); - line[vol+1] = 'X'; + line[vol + 1] = 'X'; vl[i] = line; } int cl = 3; - if(i == 0 && config.scr_width == 320) cl = 0; - if(i == 1 && config.scr_width == 640) cl = 0; - if(i == 2 && config.scr_bpp == 16) cl = 0; - if(i == 3 && config.scr_bpp == 24) cl = 0; - if(i == 4 && config.scr_bpp == 32) cl = 0; - if(i == 6 && config.fullscreen != 0) cl = 0; - if(i == 7 && config.fullscreen == 0) cl = 0; - if(i == 9 && config.music == 1) cl = 0; - if(i == 10 && config.music == 0) cl = 0; - if(i == 12 && config.effects == 1) cl = 0; - if(i == 13 && config.effects == 0) cl = 0; - - if(i > 18) cl = 0; + if (i == 0 && config.scr_width == 320) cl = 0; + if (i == 1 && config.scr_width == 640) cl = 0; + if (i == 2 && config.scr_bpp == 16) cl = 0; + if (i == 3 && config.scr_bpp == 24) cl = 0; + if (i == 4 && config.scr_bpp == 32) cl = 0; + if (i == 6 && config.fullscreen != 0) cl = 0; + if (i == 7 && config.fullscreen == 0) cl = 0; + if (i == 9 && config.music == 1) cl = 0; + if (i == 10 && config.music == 0) cl = 0; + if (i == 12 && config.effects == 1) cl = 0; + if (i == 13 && config.effects == 0) cl = 0; + + if (i > 18) cl = 0; sys_print(videobuffer, vr[i], 156 - 8 * strlen(vr[i]), sy + i * 8, 0); sys_print(videobuffer, vl[i], 164, sy + i * 8, cl); } curselt = cursel; - if(cursel > 4) curselt = curselt + 1; - if(cursel > 6) curselt = curselt + 1; - if(cursel > 8) curselt = curselt + 1; - if(cursel > 10) curselt = curselt + 1; - if(cursel > 11) curselt = curselt + 1; - if(cursel > 12) curselt = curselt + 1; - if(cursel > 13) curselt = curselt + 1; + if (cursel > 4) curselt = curselt + 1; + if (cursel > 6) curselt = curselt + 1; + if (cursel > 8) curselt = curselt + 1; + if (cursel > 10) curselt = curselt + 1; + if (cursel > 11) curselt = curselt + 1; + if (cursel > 12) curselt = curselt + 1; + if (cursel > 13) curselt = curselt + 1; rc.x = 148 + 3 * cos(3.14159 * 2 * itemyloc / 16.0); rc.y = sy + 8 * curselt - 4; @@ -1380,10 +1368,10 @@ void game_configmenu() SDL_BlitSurface(itemimg[15], NULL, videobuffer, &rc); float yy = 255.0; - if(ticks < ticks1 + 1000) { + if (ticks < ticks1 + 1000) { yy = 255.0 * ((float)(ticks - ticks1) / 1000.0); - if(yy < 0.0) yy = 0.0; - if(yy > 255.0) yy = 255.0; + if (yy < 0.0) yy = 0.0; + if (yy > 255.0) yy = 255.0; } SDL_SetAlpha(videobuffer, SDL_SRCALPHA, (int)yy); @@ -1400,82 +1388,82 @@ void game_configmenu() fpsr = (float)tickspassed / 24; fp++; - if(ticks > nextticks) { + if (ticks > nextticks) { nextticks = ticks + 1000; fps = fp; fp = 0; } itemyloc += 0.75 * fpsr; - while(itemyloc >= 16) itemyloc -= 16; + while (itemyloc >= 16) itemyloc -= 16; - if(keypause < ticks) { + if (keypause < ticks) { SDL_PollEvent(&event); keys = SDL_GetKeyState(NULL); - if(event.type == SDL_KEYDOWN) { + if (event.type == SDL_KEYDOWN) { keypause = ticks + tickwait; - if(keys[SDLK_ESCAPE] || keys[SDLK_LALT]) break; + if (keys[SDLK_ESCAPE] || keys[SDLK_LALT]) break; - if(keys[SDLK_LEFT]) { - if(cursel == 11) { + if (keys[SDLK_LEFT]) { + if (cursel == 11) { config.musicvol = config.musicvol - 25; - if(config.musicvol < 0) config.musicvol = 0; + if (config.musicvol < 0) config.musicvol = 0; Mix_Volume(musicchannel, config.musicvol); Mix_Volume(menuchannel, config.musicvol); - } else if(cursel == 12) { + } else if (cursel == 12) { config.effectsvol = config.effectsvol - 25; - if(config.effectsvol < 0) config.effectsvol = 0; + if (config.effectsvol < 0) config.effectsvol = 0; Mix_Volume(-1, config.effectsvol); Mix_Volume(musicchannel, config.musicvol); Mix_Volume(menuchannel, config.musicvol); - if(menabled == 1 && config.effects == 1) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[snddoor], 0); Mix_Volume(snd, config.effectsvol); } } } - if(keys[SDLK_RIGHT]) { - if(cursel == 11) { + if (keys[SDLK_RIGHT]) { + if (cursel == 11) { config.musicvol = config.musicvol + 25; - if(config.musicvol > 255) config.musicvol = 255; + if (config.musicvol > 255) config.musicvol = 255; Mix_Volume(musicchannel, config.musicvol); Mix_Volume(menuchannel, config.musicvol); - } else if(cursel == 12) { + } else if (cursel == 12) { config.effectsvol = config.effectsvol + 25; - if(config.effectsvol > 255) config.effectsvol = 255; + if (config.effectsvol > 255) config.effectsvol = 255; Mix_Volume(-1, config.effectsvol); Mix_Volume(musicchannel, config.musicvol); Mix_Volume(menuchannel, config.musicvol); - if(menabled == 1 && config.effects == 1) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[snddoor], 0); Mix_Volume(snd, config.effectsvol); } } } - if(keys[SDLK_UP]) { + if (keys[SDLK_UP]) { cursel--; - if(cursel < MINCURSEL) cursel = 14; + if (cursel < MINCURSEL) cursel = 14; } - if(keys[SDLK_DOWN]) { + if (keys[SDLK_DOWN]) { cursel++; - if(cursel > 14) cursel = MINCURSEL; + if (cursel > 14) cursel = MINCURSEL; } - if(keys[SDLK_LCTRL] || keys[SDLK_RETURN]) { - if(cursel == 0) { + if (keys[SDLK_LCTRL] || keys[SDLK_RETURN]) { + if (cursel == 0) { fullscreen = config.fullscreen | config.hwaccel | config.hwsurface; video = SDL_SetVideoMode(320, 240, config.scr_bpp, fullscreen); - if(video == 0) { + if (video == 0) { video = SDL_SetVideoMode(config.scr_width, config.scr_height, config.scr_bpp, fullscreen); } else { config.scr_width = 320; @@ -1484,11 +1472,11 @@ void game_configmenu() SDL_UpdateRect(video, 0, 0, config.scr_width, config.scr_height); } - if(cursel == 1) { + if (cursel == 1) { fullscreen = config.fullscreen | config.hwaccel | config.hwsurface; video = SDL_SetVideoMode(640, 480, config.scr_bpp, fullscreen); - if(video == 0) { + if (video == 0) { video = SDL_SetVideoMode(config.scr_width, config.scr_height, config.scr_bpp, fullscreen); } else { config.scr_width = 640; @@ -1497,14 +1485,14 @@ void game_configmenu() SDL_UpdateRect(video, 0, 0, config.scr_width, config.scr_height); } - if(cursel == 2 || cursel == 3 || cursel == 4) { + if (cursel == 2 || cursel == 3 || cursel == 4) { fullscreen = config.fullscreen | config.hwaccel | config.hwsurface; int b = 16; - if(cursel == 3) b = 24; - if(cursel == 4) b = 32; + if (cursel == 3) b = 24; + if (cursel == 4) b = 32; video = SDL_SetVideoMode(config.scr_width, config.scr_height, b, fullscreen); - if(video == 0) { + if (video == 0) { video = SDL_SetVideoMode(config.scr_width, config.scr_height, config.scr_bpp, fullscreen); } else { config.scr_bpp = b; @@ -1512,12 +1500,12 @@ void game_configmenu() SDL_UpdateRect(video, 0, 0, config.scr_width, config.scr_height); } - if(cursel == 5) { + if (cursel == 5) { ofullscreen = config.fullscreen | config.hwaccel | config.hwsurface; fullscreen = SDL_FULLSCREEN | config.hwaccel | config.hwsurface; video = SDL_SetVideoMode(config.scr_width, config.scr_height, config.scr_bpp, fullscreen); - if(video == 0) { + if (video == 0) { video = SDL_SetVideoMode(config.scr_width, config.scr_height, config.scr_bpp, ofullscreen); } else { config.fullscreen = SDL_FULLSCREEN; @@ -1525,12 +1513,12 @@ void game_configmenu() SDL_UpdateRect(video, 0, 0, config.scr_width, config.scr_height); } - if(cursel == 6) { + if (cursel == 6) { ofullscreen = config.fullscreen | config.hwaccel | config.hwsurface; fullscreen = 0 | config.hwaccel | config.hwsurface; video = SDL_SetVideoMode(config.scr_width, config.scr_height, config.scr_bpp, fullscreen); - if(video == 0) { + if (video == 0) { video = SDL_SetVideoMode(config.scr_width, config.scr_height, config.scr_bpp, ofullscreen); } else { config.fullscreen = 0; @@ -1538,34 +1526,34 @@ void game_configmenu() SDL_UpdateRect(video, 0, 0, config.scr_width, config.scr_height); } - if(cursel == 7 && config.music == 0) { + if (cursel == 7 && config.music == 0) { config.music = 1; - if(menabled == 1) { + if (menabled == 1) { menuchannel = Mix_PlayChannel(-1, mmenu, -1); Mix_Volume(menuchannel, config.musicvol); } } - if(cursel == 8 && config.music == 1) { + if (cursel == 8 && config.music == 1) { config.music = 0; Mix_HaltChannel(musicchannel); Mix_HaltChannel(menuchannel); } - if(cursel == 9 && config.effects == 0) { + if (cursel == 9 && config.effects == 0) { config.effects = 1; - if(menabled == 1) { + if (menabled == 1) { int snd = Mix_PlayChannel(-1, sfx[snddoor], 0); Mix_Volume(snd, config.effectsvol); } } - if(cursel == 10 && config.effects == 1) config.effects = 0; + if (cursel == 10 && config.effects == 1) config.effects = 0; - if(cursel == 13) { + if (cursel == 13) { config_save(&config); break; } - if(cursel == 14) { + if (cursel == 14) { // reset keys to avoid returning keys[SDLK_SPACE] = keys[SDLK_RETURN] = 0; break; @@ -1575,10 +1563,10 @@ void game_configmenu() } clouddeg += 0.01 * fpsr; - while(clouddeg >= 360) clouddeg = clouddeg - 360; + while (clouddeg >= 360) clouddeg = clouddeg - 360; SDL_Delay(10); - } while(1); + } while (1); SDL_FreeSurface(configwindow); itemticks = ticks + 210; @@ -1586,37 +1574,36 @@ void game_configmenu() SDL_SetAlpha(cloudimg, SDL_SRCALPHA, 64); } -void game_damagenpc(int npcnum, int damage, int spell) -{ +void game_damagenpc(int npcnum, int damage, int spell) { float npx, npy; int lx, ly, cx, cy, alive; char line[256]; int ratio; int fcol, heal, ff; - if(damage == 0) { + if (damage == 0) { strcpy(line, "miss!"); fcol = 2; } else { ratio = 0; heal = 0; - if(damage < 0) heal = 1; + if (damage < 0) heal = 1; damage = abs(damage); - if(heal == 0) { - if(damage > npcinfo[npcnum].hp) { + if (heal == 0) { + if (damage > npcinfo[npcnum].hp) { ratio = (damage - npcinfo[npcnum].hp) * 100 / damage; damage = npcinfo[npcnum].hp; } npcinfo[npcnum].hp -= damage; - if(npcinfo[npcnum].hp < 0) npcinfo[npcnum].hp = 0; + if (npcinfo[npcnum].hp < 0) npcinfo[npcnum].hp = 0; sprintf(line, "-%i", damage); fcol = 1; } else { npcinfo[npcnum].hp += damage; - if(npcinfo[npcnum].hp > npcinfo[npcnum].maxhp) npcinfo[npcnum].hp = npcinfo[npcnum].maxhp; + if (npcinfo[npcnum].hp > npcinfo[npcnum].maxhp) npcinfo[npcnum].hp = npcinfo[npcnum].maxhp; sprintf(line, "+%i", damage); fcol = 5; @@ -1624,67 +1611,67 @@ void game_damagenpc(int npcnum, int damage, int spell) npcinfo[npcnum].pause = ticks + 900; - if(spell == 0) player.attackstrength = ratio; + if (spell == 0) player.attackstrength = ratio; } game_addFloatText(line, npcinfo[npcnum].x + 12 - 4 * strlen(line), npcinfo[npcnum].y + 16, fcol); - if(npcinfo[npcnum].spriteset == 12) game_castspell(9, npcinfo[npcnum].x, npcinfo[npcnum].y, player.px, player.py, npcnum); + if (npcinfo[npcnum].spriteset == 12) game_castspell(9, npcinfo[npcnum].x, npcinfo[npcnum].y, player.px, player.py, npcnum); // if enemy is killed - if(npcinfo[npcnum].hp == 0) { + if (npcinfo[npcnum].hp == 0) { player.exp = player.exp + npcinfo[npcnum].maxhp; - if(npcinfo[npcnum].spriteset == 1 || npcinfo[npcnum].spriteset == 7 || npcinfo[npcnum].spriteset == 6) { + if (npcinfo[npcnum].spriteset == 1 || npcinfo[npcnum].spriteset == 7 || npcinfo[npcnum].spriteset == 6) { ff = (int)(RND() * player.level * 3); - if(ff == 0) { + if (ff == 0) { npx = npcinfo[npcnum].x + 12; npy = npcinfo[npcnum].y + 20; lx = (int)npx / 16; ly = (int)npy / 16; - if(objmap[lx][ly] == -1) objmap[lx][ly] = 4; + if (objmap[lx][ly] == -1) objmap[lx][ly] = 4; } } - if(npcinfo[npcnum].spriteset == 2 || npcinfo[npcnum].spriteset == 9 || npcinfo[npcnum].spriteset == 4 || npcinfo[npcnum].spriteset == 5) { + if (npcinfo[npcnum].spriteset == 2 || npcinfo[npcnum].spriteset == 9 || npcinfo[npcnum].spriteset == 4 || npcinfo[npcnum].spriteset == 5) { ff = (int)(RND() * player.level); - if(ff == 0) { + if (ff == 0) { npx = npcinfo[npcnum].x + 12; npy = npcinfo[npcnum].y + 20; lx = (int)npx / 16; ly = (int)npy / 16; - if(objmap[lx][ly] == -1) objmap[lx][ly] = 12; + if (objmap[lx][ly] == -1) objmap[lx][ly] = 12; } } - if(npcinfo[npcnum].spriteset == 9 || npcinfo[npcnum].spriteset == 10 || npcinfo[npcnum].spriteset == 5) { + if (npcinfo[npcnum].spriteset == 9 || npcinfo[npcnum].spriteset == 10 || npcinfo[npcnum].spriteset == 5) { ff = (int)(RND() * player.level * 2); - if(ff == 0) { + if (ff == 0) { npx = npcinfo[npcnum].x + 12; npy = npcinfo[npcnum].y + 20; lx = (int)npx / 16; ly = (int)npy / 16; - if(objmap[lx][ly] == -1) objmap[lx][ly] = 13; + if (objmap[lx][ly] == -1) objmap[lx][ly] = 13; } } // academy master key chest script - if(npcinfo[npcnum].script == 2) { + if (npcinfo[npcnum].script == 2) { cx = 9; cy = 7; alive = 0; - for(int i = 1; i <= lastnpc; i++) { - if(npcinfo[i].hp > 0) alive = 1; + for (int i = 1; i <= lastnpc; i++) { + if (npcinfo[i].hp > 0) alive = 1; } - if(alive == 0) { + if (alive == 0) { objmap[cx][cy] = 5; rcDest.x = cx * 8; @@ -1698,23 +1685,23 @@ void game_damagenpc(int npcnum, int damage, int spell) lx = (int)npx / 16; ly = (int)npy / 16; - if(lx == cx && ly == cy) player.py = player.py + 16; - SDL_FillRect(clipbg2, &rcDest, SDL_MapRGB(clipbg->format, 255,255,255)); + if (lx == cx && ly == cy) player.py = player.py + 16; + SDL_FillRect(clipbg2, &rcDest, SDL_MapRGB(clipbg->format, 255, 255, 255)); scriptflag[2][0] = 1; } } // academy crystal chest script - if(npcinfo[npcnum].script == 3) { + if (npcinfo[npcnum].script == 3) { cx = 9; cy = 7; alive = 0; - for(int i = 1; i <= lastnpc; i++) { - if(npcinfo[i].hp > 0) alive = 1; + for (int i = 1; i <= lastnpc; i++) { + if (npcinfo[i].hp > 0) alive = 1; } - if(alive == 0) { + if (alive == 0) { objmap[cx][cy] = 6; rcDest.x = cx * 8; @@ -1728,49 +1715,49 @@ void game_damagenpc(int npcnum, int damage, int spell) lx = (int)npx / 16; ly = (int)npy / 16; - if(lx == cx && ly == cy) player.py = player.py + 16; + if (lx == cx && ly == cy) player.py = player.py + 16; scriptflag[3][0] = 1; - SDL_FillRect(clipbg2, &rcDest, SDL_MapRGB(clipbg->format, 255,255,255)); + SDL_FillRect(clipbg2, &rcDest, SDL_MapRGB(clipbg->format, 255, 255, 255)); } } // tower shield chest script - if(npcinfo[npcnum].script == 4 && scriptflag[4][0] == 0) { - triggerloc[9][7] = 5004; + if (npcinfo[npcnum].script == 4 && scriptflag[4][0] == 0) { + triggerloc[9][7] = 5004; - int curtile = 40; - int curtilel = 0; - int curtilex = curtile % 20; - int curtiley = (curtile - curtilex) / 20; + int curtile = 40; + int curtilel = 0; + int curtilex = curtile % 20; + int curtiley = (curtile - curtilex) / 20; - int l = 0; // ?? not defined in original code - tileinfo[l][9][7][0] = curtile + 1; - tileinfo[l][9][7][1] = 0; + int l = 0; // ?? not defined in original code + tileinfo[l][9][7][0] = curtile + 1; + tileinfo[l][9][7][1] = 0; - rcSrc.x = curtilex * 16; - rcSrc.y = curtiley * 16; - rcSrc.w = 16; - rcSrc.h = 16; + rcSrc.x = curtilex * 16; + rcSrc.y = curtiley * 16; + rcSrc.w = 16; + rcSrc.h = 16; - rcDest.x = 9 * 16; - rcDest.y = 7 * 16; - rcDest.w = 16; - rcDest.h = 16; + rcDest.x = 9 * 16; + rcDest.y = 7 * 16; + rcDest.w = 16; + rcDest.h = 16; - SDL_BlitSurface(tiles[curtilel], &rcSrc, mapbg, &rcDest); + SDL_BlitSurface(tiles[curtilel], &rcSrc, mapbg, &rcDest); } // firehydra sword chest - if(npcinfo[npcnum].script == 5) { + if (npcinfo[npcnum].script == 5) { cx = 9; cy = 6; alive = 0; - for(int i = 1; i <= lastnpc; i++) { - if(npcinfo[i].hp > 0) alive = 1; + for (int i = 1; i <= lastnpc; i++) { + if (npcinfo[i].hp > 0) alive = 1; } - if(alive == 0) { + if (alive == 0) { objmap[cx][cy] = 9; rcDest.x = cx * 8; @@ -1784,24 +1771,24 @@ void game_damagenpc(int npcnum, int damage, int spell) lx = (int)npx / 16; ly = (int)npy / 16; - if(lx == cx && ly == cy) player.py = player.py + 16; + if (lx == cx && ly == cy) player.py = player.py + 16; scriptflag[5][0] = 1; - SDL_FillRect(clipbg2, &rcDest, SDL_MapRGB(clipbg->format, 255,255,255)); + SDL_FillRect(clipbg2, &rcDest, SDL_MapRGB(clipbg->format, 255, 255, 255)); } } // gardens master key script - if(npcinfo[npcnum].script == 8 && scriptflag[6][0] == 0) { + if (npcinfo[npcnum].script == 8 && scriptflag[6][0] == 0) { cx = 13; cy = 7; alive = 0; - for(int i = 1; i <= lastnpc; i++) { - if(npcinfo[i].hp > 0) alive = 1; + for (int i = 1; i <= lastnpc; i++) { + if (npcinfo[i].hp > 0) alive = 1; } - if(alive == 0) { + if (alive == 0) { objmap[cx][cy] = 5; rcDest.x = cx * 8; @@ -1815,24 +1802,24 @@ void game_damagenpc(int npcnum, int damage, int spell) lx = (int)npx / 16; ly = (int)npy / 16; - if(lx == cx && ly == cy) player.py = player.py + 16; - SDL_FillRect(clipbg2, &rcDest, SDL_MapRGB(clipbg->format, 255,255,255)); + if (lx == cx && ly == cy) player.py = player.py + 16; + SDL_FillRect(clipbg2, &rcDest, SDL_MapRGB(clipbg->format, 255, 255, 255)); scriptflag[8][0] = 1; } } // regular key chest 1 - for(int s = 20; s <= 23; s++) { - if(npcinfo[npcnum].script == s && scriptflag[s][0] < 2) { + for (int s = 20; s <= 23; s++) { + if (npcinfo[npcnum].script == s && scriptflag[s][0] < 2) { cx = 9; cy = 7; alive = 0; - for(int i = 1; i <= lastnpc; i++) { - if(npcinfo[i].hp > 0) alive = 1; + for (int i = 1; i <= lastnpc; i++) { + if (npcinfo[i].hp > 0) alive = 1; } - if(alive == 0) { + if (alive == 0) { objmap[cx][cy] = 11; rcDest.x = cx * 8; @@ -1846,24 +1833,24 @@ void game_damagenpc(int npcnum, int damage, int spell) lx = (int)npx / 16; ly = (int)npy / 16; - if(lx == cx && ly == cy) player.py = player.py + 16; + if (lx == cx && ly == cy) player.py = player.py + 16; scriptflag[s][0] = 1; - SDL_FillRect(clipbg2, &rcDest, SDL_MapRGB(clipbg->format, 255,255,255)); + SDL_FillRect(clipbg2, &rcDest, SDL_MapRGB(clipbg->format, 255, 255, 255)); } } } // pickup lightning bomb - if(npcinfo[npcnum].script == 9 && (curmap == 41 && scriptflag[9][1] == 0)) { + if (npcinfo[npcnum].script == 9 && (curmap == 41 && scriptflag[9][1] == 0)) { cx = 9; cy = 7; alive = 0; - for(int i = 1; i <= lastnpc; i++) { - if(npcinfo[i].hp > 0) alive = 1; + for (int i = 1; i <= lastnpc; i++) { + if (npcinfo[i].hp > 0) alive = 1; } - if(alive == 0) { + if (alive == 0) { objmap[cx][cy] = 13; rcDest.x = cx * 8; @@ -1877,21 +1864,21 @@ void game_damagenpc(int npcnum, int damage, int spell) lx = (int)npx / 16; ly = (int)npy / 16; - if(lx == cx && ly == cy) player.py = player.py + 16; + if (lx == cx && ly == cy) player.py = player.py + 16; } } // citadel armour chest - if(npcinfo[npcnum].script == 12) { + if (npcinfo[npcnum].script == 12) { cx = 8; cy = 7; alive = 0; - for(int i = 1; i <= lastnpc; i++) { - if(npcinfo[i].hp > 0) alive = 1; + for (int i = 1; i <= lastnpc; i++) { + if (npcinfo[i].hp > 0) alive = 1; } - if(alive == 0) { + if (alive == 0) { objmap[cx][cy] = 16; rcDest.x = cx * 8; @@ -1905,23 +1892,23 @@ void game_damagenpc(int npcnum, int damage, int spell) lx = (int)npx / 16; ly = (int)npy / 16; - if(lx == cx && ly == cy) player.py = player.py + 16; + if (lx == cx && ly == cy) player.py = player.py + 16; scriptflag[12][0] = 1; - SDL_FillRect(clipbg2, &rcDest, SDL_MapRGB(clipbg->format, 255,255,255)); + SDL_FillRect(clipbg2, &rcDest, SDL_MapRGB(clipbg->format, 255, 255, 255)); } } // citadel master key script - if(npcinfo[npcnum].script == 13 && scriptflag[13][0] == 0) { + if (npcinfo[npcnum].script == 13 && scriptflag[13][0] == 0) { cx = 11; cy = 10; alive = 0; - for(int i = 1; i <= lastnpc; i++) { - if(npcinfo[i].hp > 0) alive = 1; + for (int i = 1; i <= lastnpc; i++) { + if (npcinfo[i].hp > 0) alive = 1; } - if(alive == 0) { + if (alive == 0) { objmap[cx][cy] = 5; rcDest.x = cx * 8; @@ -1935,20 +1922,20 @@ void game_damagenpc(int npcnum, int damage, int spell) lx = (int)npx / 16; ly = (int)npy / 16; - if(lx == cx && ly == cy) player.py = player.py + 16; - SDL_FillRect(clipbg2, &rcDest, SDL_MapRGB(clipbg->format, 255,255,255)); + if (lx == cx && ly == cy) player.py = player.py + 16; + SDL_FillRect(clipbg2, &rcDest, SDL_MapRGB(clipbg->format, 255, 255, 255)); scriptflag[13][0] = 1; } } // max ups - if(npcinfo[npcnum].script == 15 && scriptflag[15][0] == 0) { + if (npcinfo[npcnum].script == 15 && scriptflag[15][0] == 0) { alive = 0; - for(int i = 1; i <= lastnpc; i++) { - if(npcinfo[i].hp > 0) alive = 1; + for (int i = 1; i <= lastnpc; i++) { + if (npcinfo[i].hp > 0) alive = 1; } - if(alive == 0) { + if (alive == 0) { cx = 6; cy = 8; @@ -1965,8 +1952,8 @@ void game_damagenpc(int npcnum, int damage, int spell) lx = (int)npx / 16; ly = (int)npy / 16; - if(lx == cx && ly == cy) player.py = player.py + 16; - SDL_FillRect(clipbg2, &rcDest, SDL_MapRGB(clipbg->format, 255,255,255)); + if (lx == cx && ly == cy) player.py = player.py + 16; + SDL_FillRect(clipbg2, &rcDest, SDL_MapRGB(clipbg->format, 255, 255, 255)); scriptflag[15][0] = 1; cx = 9; @@ -1985,8 +1972,8 @@ void game_damagenpc(int npcnum, int damage, int spell) lx = (int)npx / 16; ly = (int)npy / 16; - if(lx == cx && ly == cy) player.py = player.py + 16; - SDL_FillRect(clipbg2, &rcDest, SDL_MapRGB(clipbg->format, 255,255,255)); + if (lx == cx && ly == cy) player.py = player.py + 16; + SDL_FillRect(clipbg2, &rcDest, SDL_MapRGB(clipbg->format, 255, 255, 255)); scriptflag[16][0] = 1; @@ -2006,56 +1993,54 @@ void game_damagenpc(int npcnum, int damage, int spell) lx = (int)npx / 16; ly = (int)npy / 16; - if(lx == cx && ly == cy) player.py = player.py + 16; - SDL_FillRect(clipbg2, &rcDest, SDL_MapRGB(clipbg->format, 255,255,255)); + if (lx == cx && ly == cy) player.py = player.py + 16; + SDL_FillRect(clipbg2, &rcDest, SDL_MapRGB(clipbg->format, 255, 255, 255)); scriptflag[17][0] = 1; } } - if(npcinfo[npcnum].script == 14) game_endofgame(); + if (npcinfo[npcnum].script == 14) game_endofgame(); } } -void game_damageplayer(int damage) -{ +void game_damageplayer(int damage) { char line[256]; player.hp -= damage; - if(player.hp < 0) player.hp = 0; + if (player.hp < 0) player.hp = 0; sprintf(line, "-%i", damage); - if(damage == 0) strcpy(line, "miss!"); + if (damage == 0) strcpy(line, "miss!"); game_addFloatText(line, player.px + 12 - 4 * strlen(line), player.py + 16, 4); player.pause = ticks + 1000; } -void game_drawanims(int Layer) -{ - for(int sx = 0; sx <= 19; sx++) { - for(int sy = 0; sy <= 14; sy++) { +void game_drawanims(int Layer) { + for (int sx = 0; sx <= 19; sx++) { + for (int sy = 0; sy <= 14; sy++) { int o = objmap[sx][sy]; - if(o > -1) { + if (o > -1) { int xtiles = objectinfo[o][1]; int ytiles = objectinfo[o][2]; int cframe = objectframe[o][1]; - for(int x = 0; x <= xtiles - 1; x++) { - for(int y = 0; y <= ytiles - 1; y++) { + for (int x = 0; x <= xtiles - 1; x++) { + for (int y = 0; y <= ytiles - 1; y++) { int x1 = (sx + x) * 16; int y1 = (sy + y) * 16; - if(objecttile[o][cframe][x][y][1] == Layer) { + if (objecttile[o][cframe][x][y][1] == Layer) { int c = objecttile[o][cframe][x][y][0]; c = c - 1; int curtilel = 3; int curtilex = c % 20; int curtiley = (c - curtilex) / 20; - if(curmap == 58 && scriptflag[60][0] > 0) curtilex = 1; - if(curmap == 54 && scriptflag[60][0] > 1) curtilex = 1; + if (curmap == 58 && scriptflag[60][0] > 0) curtilex = 1; + if (curmap == 54 && scriptflag[60][0] > 1) curtilex = 1; rcSrc.x = curtilex * 16; rcSrc.y = curtiley * 16; rcSrc.w = 16; @@ -2069,10 +2054,10 @@ void game_drawanims(int Layer) SDL_BlitSurface(tiles[curtilel], &rcSrc, videobuffer, &rcDest); } - if(Layer == 1) { - for(int l = 1; l <= 2; l++) { + if (Layer == 1) { + for (int l = 1; l <= 2; l++) { int c = tileinfo[l][sx + x][sy + y][0]; - if(c > 0) { + if (c > 0) { int cl = tileinfo[l][sx + x][sy + y][1]; c = c - 1; @@ -2092,15 +2077,15 @@ void game_drawanims(int Layer) rcDest.h = 16; int pass = 1; - if(curtilel == 1) { - for(int ff = 0; ff <= 5; ff++) { + if (curtilel == 1) { + for (int ff = 0; ff <= 5; ff++) { int ffa = 20 * 5 - 1 + ff * 20; int ffb = 20 * 5 + 4 + ff * 20; - if(curtile > ffa && curtile < ffb) pass = 0; + if (curtile > ffa && curtile < ffb) pass = 0; } } - if(pass == 1) SDL_BlitSurface(tiles[curtilel], &rcSrc, videobuffer, &rcDest); + if (pass == 1) SDL_BlitSurface(tiles[curtilel], &rcSrc, videobuffer, &rcDest); } } } @@ -2111,8 +2096,7 @@ void game_drawanims(int Layer) } } -int hud_recalc(int a, int b, int c) -{ +int hud_recalc(int a, int b, int c) { int result = a * b / c; return result > b ? b : result; @@ -2120,8 +2104,7 @@ int hud_recalc(int a, int b, int c) #define RGB(R, G, B) (SDL_MapRGB(videobuffer->format, (R), (G), (B))) -void game_drawhud() -{ +void game_drawhud() { char line[128]; //sprintf(line, "fps: %i, map: %i, exp: %i/%i", (int)fps, curmap, player.exp, player.nextlevel); //sys_print(videobuffer, line, 0, 0, 0); @@ -2130,16 +2113,17 @@ void game_drawhud() game_fillrect(videobuffer2, 0, 0, 320, 240, 0); - for(int i = 0; i < MAXFLOAT; i++) { - if(floattext[i][0] > 0) { + for (int i = 0; i < MAXFLOAT; i++) { + if (floattext[i][0] > 0) { int fc = (int)floattext[i][3]; int c = fc, c2 = 3; - if(fc == 4) c = 1; else if(fc == 5) c = 0; + if (fc == 4) c = 1; + else if (fc == 5) c = 0; - if(fc == 1 || fc == 3) c2 = 2; + if (fc == 1 || fc == 3) c2 = 2; - if(fc != 0) { + if (fc != 0) { sys_print(videobuffer, floatstri[i], (int)(floattext[i][1]) + 0, (int)(floattext[i][2]) - 1, c2); sys_print(videobuffer, floatstri[i], (int)(floattext[i][1]) + 0, (int)(floattext[i][2]) + 1, c2); sys_print(videobuffer, floatstri[i], (int)(floattext[i][1]) - 1, (int)(floattext[i][2]) + 0, c2); @@ -2149,7 +2133,7 @@ void game_drawhud() sys_print(videobuffer, floatstri[i], (int)(floattext[i][1]), (int)(floattext[i][2]), c); } - if(floaticon[i][0] > 0) { + if (floaticon[i][0] > 0) { int ico = floaticon[i][3]; int ix = floaticon[i][1]; int iy = floaticon[i][2]; @@ -2157,8 +2141,8 @@ void game_drawhud() rcDest.x = ix; rcDest.y = iy; - if(ico != 99) SDL_BlitSurface(itemimg[ico], NULL, videobuffer, &rcDest); - if(ico == 99) { + if (ico != 99) SDL_BlitSurface(itemimg[ico], NULL, videobuffer, &rcDest); + if (ico == 99) { SDL_SetAlpha(spellimg, SDL_SRCALPHA, (int)(RND() * 96) + 96); rcSrc.x = 16 * (int)(RND() * 2); @@ -2176,7 +2160,7 @@ void game_drawhud() } } - if(itemselon == 0) { + if (itemselon == 0) { int sy = 211; @@ -2185,24 +2169,24 @@ void game_drawhud() rcSrc.y = sy; // spells in game - if(player.foundspell[0] == 1) { - for(int i = 0; i < 5; i++) { + if (player.foundspell[0] == 1) { + for (int i = 0; i < 5; i++) { rcSrc.x = rcSrc.x + 17; - if(player.foundspell[i] == 1) { + if (player.foundspell[i] == 1) { SDL_BlitSurface(itemimg[7 + i], NULL, videobuffer, &rcSrc); game_fillrect(videobuffer, rcSrc.x, sy + 16, 16, 4, RGB(0, 32, 32)); game_fillrect(videobuffer, rcSrc.x + 1, sy + 17, - hud_recalc(player.spellcharge[i], 14, 100), 2, - player.spellcharge[i] == 100 ? RGB(255, 128, 32) : RGB(0, 224, 64)); + hud_recalc(player.spellcharge[i], 14, 100), 2, + player.spellcharge[i] == 100 ? RGB(255, 128, 32) : RGB(0, 224, 64)); } } } return; } - if(selenemyon == 0) { + if (selenemyon == 0) { rcDest.x = 0; rcDest.y = 0; rcDest.w = 320; @@ -2227,22 +2211,22 @@ void game_drawhud() rcDest.y = 46 + 77; int amap = 0; - if(curmap > 46) amap = 2; - if(curmap > 67) amap = 3; - if(curmap > 5 && curmap < 42) amap = 1; + if (curmap > 46) amap = 2; + if (curmap > 67) amap = 3; + if (curmap > 5 && curmap < 42) amap = 1; SDL_BlitSurface(mapimg[amap], NULL, videobuffer, &rcDest); ccc = SDL_MapRGB(videobuffer->format, 128 + 127 * sin(3.141592 * 2 * itemyloc / 16), 0, 0); - for(int b = 0; b <= 6; b++) { - for(int a = 0; a <= 12; a++) { - if(invmap[amap][b][a] == curmap) { + for (int b = 0; b <= 6; b++) { + for (int a = 0; a <= 12; a++) { + if (invmap[amap][b][a] == curmap) { game_fillrect(videobuffer, 46 + 9 + a * 9 + 2, 46 + 77 + b * 9 + 1, 6, 6, ccc); } } } - if(amap == 1) { + if (amap == 1) { sys_print(videobuffer, "L1", 46 + 9, 46 + 77, 0); sys_print(videobuffer, "L2", 46 + 9 + 7 * 9, 46 + 77, 0); } @@ -2251,24 +2235,24 @@ void game_drawhud() sys_print(videobuffer, line, sx, sy, player.hp <= player.maxhp * 0.25 ? (int)player.hpflash : 0); sprintf(line, "Level : %i", player.level); - if(player.level == player.maxlevel) strcpy(line, "Level : MAX"); + if (player.level == player.maxlevel) strcpy(line, "Level : MAX"); sys_print(videobuffer, line, sx, sy + 8, 0); // experience game_fillrect(videobuffer, sx + 64, sy + 16, 16, 4, RGB(0, 32, 32)); game_fillrect(videobuffer, sx + 65, sy + 17, - hud_recalc(player.exp, 14, player.nextlevel), 2, RGB(0, 224, 64)); + hud_recalc(player.exp, 14, player.nextlevel), 2, RGB(0, 224, 64)); // attack strength game_fillrect(videobuffer, sx + 1, sy + 16, 56, 6, RGB(0, 32, 32)); game_fillrect(videobuffer, sx + 1, sy + 17, - hud_recalc(player.attackstrength, 54, 100), 2, - player.attackstrength == 100 ? RGB(255, 128, 32) : RGB(0, 64, 224)); + hud_recalc(player.attackstrength, 54, 100), 2, + player.attackstrength == 100 ? RGB(255, 128, 32) : RGB(0, 64, 224)); // spell strength game_fillrect(videobuffer, sx + 1, sy + 19, - hud_recalc(player.spellstrength, 54, 100), 2, - player.spellstrength == 100 ? RGB(224, 0, 0) : RGB(128, 0, 224)); + hud_recalc(player.spellstrength, 54, 100), 2, + player.spellstrength == 100 ? RGB(224, 0, 0) : RGB(128, 0, 224)); // time int ase = secstart + secsingame; @@ -2287,61 +2271,61 @@ void game_drawhud() rcSrc.y = 91; int ss = (player.sword - 1) * 3; - if(player.sword == 3) ss = 18; + if (player.sword == 3) ss = 18; SDL_BlitSurface(itemimg[ss], NULL, videobuffer, &rcSrc); rcSrc.x = rcSrc.x + 16; ss = (player.shield - 1) * 3 + 1; - if(player.shield == 3) ss = 19; + if (player.shield == 3) ss = 19; SDL_BlitSurface(itemimg[ss], NULL, videobuffer, &rcSrc); rcSrc.x = rcSrc.x + 16; ss = (player.armour - 1) * 3 + 2; - if(player.armour == 3) ss = 20; + if (player.armour == 3) ss = 20; SDL_BlitSurface(itemimg[ss], NULL, videobuffer, &rcSrc); - for(int i = 0; i <= 4; i++) { + for (int i = 0; i <= 4; i++) { sx = 188; sy = 70 + i * 24; rcSrc.x = sx; rcSrc.y = sy; - if(i == 0) SDL_BlitSurface(itemimg[6], NULL, videobuffer, &rcSrc); - if(i == 1) SDL_BlitSurface(itemimg[12], NULL, videobuffer, &rcSrc); - if(i == 2) SDL_BlitSurface(itemimg[17], NULL, videobuffer, &rcSrc); - if(i == 3) SDL_BlitSurface(itemimg[16], NULL, videobuffer, &rcSrc); - if(i == 4) SDL_BlitSurface(itemimg[14], NULL, videobuffer, &rcSrc); + if (i == 0) SDL_BlitSurface(itemimg[6], NULL, videobuffer, &rcSrc); + if (i == 1) SDL_BlitSurface(itemimg[12], NULL, videobuffer, &rcSrc); + if (i == 2) SDL_BlitSurface(itemimg[17], NULL, videobuffer, &rcSrc); + if (i == 3) SDL_BlitSurface(itemimg[16], NULL, videobuffer, &rcSrc); + if (i == 4) SDL_BlitSurface(itemimg[14], NULL, videobuffer, &rcSrc); sprintf(line, "x%i", player.inventory[i]); sys_print(videobuffer, line, sx + 17, sy + 7, 0); } // spells in menu - if(player.foundspell[0] == 1) { - for(int i = 0; i < 5; i++) { + if (player.foundspell[0] == 1) { + for (int i = 0; i < 5; i++) { rcSrc.x = 243; rcSrc.y = 67 + i * 24; sy = rcSrc.y; - if(player.foundspell[i] == 1) { + if (player.foundspell[i] == 1) { SDL_BlitSurface(itemimg[7 + i], NULL, videobuffer, &rcSrc); game_fillrect(videobuffer, rcSrc.x, sy + 16, 16, 4, RGB(0, 32, 32)); game_fillrect(videobuffer, rcSrc.x + 1, sy + 17, - hud_recalc(player.spellcharge[i], 14, 100), 2, - player.spellcharge[i] == 100 ? RGB(255, 128, 32) : RGB(0, 224, 64)); + hud_recalc(player.spellcharge[i], 14, 100), 2, + player.spellcharge[i] == 100 ? RGB(255, 128, 32) : RGB(0, 224, 64)); } } } - if(itemselon == 1) { - for(int i = 0; i <= 4; i++) { - if(curitem == 5 + i) { + if (itemselon == 1) { + for (int i = 0; i <= 4; i++) { + if (curitem == 5 + i) { rcDest.x = (float)(243 - 12 + 3 * sin(3.141592 * 2 * itemyloc / 16)); rcDest.y = 67 + 24 * i; SDL_BlitSurface(itemimg[15], NULL, videobuffer, &rcDest); } - if(curitem == i) { + if (curitem == i) { rcDest.x = (float)(189 - 12 + 3 * sin(3.141592 * 2 * itemyloc / 16)); rcDest.y = 70 + 24 * i; SDL_BlitSurface(itemimg[15], NULL, videobuffer, &rcDest); @@ -2350,8 +2334,8 @@ void game_drawhud() } } - if(selenemyon == 1) { - if(curenemy > lastnpc) { + if (selenemyon == 1) { + if (curenemy > lastnpc) { int pst = curenemy - lastnpc - 1; rcDest.x = postinfo[pst][0]; rcDest.y = (float)(postinfo[pst][1] - 4 - sin(3.141592 / 8 * itemyloc)); @@ -2364,8 +2348,7 @@ void game_drawhud() } } -void game_drawnpcs(int mode) -{ +void game_drawnpcs(int mode) { unsigned int ccc; ccc = SDL_MapRGB(videobuffer->format, 255, 128, 32); @@ -2373,15 +2356,15 @@ void game_drawnpcs(int mode) int fst = firsty; int lst = lasty; - if(mode == 0) lst = player.ysort; - if(mode == 1) fst = player.ysort; + if (mode == 0) lst = player.ysort; + if (mode == 1) fst = player.ysort; - for(int yy = fst; yy <= lst; yy++) { + for (int yy = fst; yy <= lst; yy++) { - if(ysort[yy] > 0) { + if (ysort[yy] > 0) { int i = ysort[yy]; - if(npcinfo[i].hp > 0) { + if (npcinfo[i].hp > 0) { int npx = (int)(npcinfo[i].x); int npy = (int)(npcinfo[i].y); @@ -2390,9 +2373,9 @@ void game_drawnpcs(int mode) int wdir = npcinfo[i].walkdir; // spriteset1 specific - if(npcinfo[i].spriteset == 1) { + if (npcinfo[i].spriteset == 1) { - if(npcinfo[i].attacking == 0) { + if (npcinfo[i].attacking == 0) { int cframe = npcinfo[i].cframe; @@ -2406,7 +2389,7 @@ void game_drawnpcs(int mode) rcDest.w = 24; rcDest.h = 24; - if(npcinfo[i].pause > ticks && npcinfo[i].shake < ticks) { + if (npcinfo[i].pause > ticks && npcinfo[i].shake < ticks) { npcinfo[i].shake = ticks + 50; rcDest.x = rcDest.x + (int)(RND() * 3) - 1; rcDest.y = rcDest.y + (int)(RND() * 3) - 1; @@ -2432,8 +2415,8 @@ void game_drawnpcs(int mode) } // onewing - if(npcinfo[i].spriteset == 2) { - for(int f = 0; f <= 7; f++) { + if (npcinfo[i].spriteset == 2) { + for (int f = 0; f <= 7; f++) { int s = npcinfo[i].bodysection[f].sprite; rcSrc.x = animset2[s].x; rcSrc.y = animset2[s].y; @@ -2449,11 +2432,11 @@ void game_drawnpcs(int mode) } // twowing - if(npcinfo[i].spriteset == 9) { - for(int f = 0; f <= 7; f++) { + if (npcinfo[i].spriteset == 9) { + for (int f = 0; f <= 7; f++) { int yp = 0; - if(f == 0 && (curmap == 53 || curmap == 57 || curmap == 61 || curmap == 65 || curmap == 56 || curmap > 66) && scriptflag[60][0] > 0) yp = 16; + if (f == 0 && (curmap == 53 || curmap == 57 || curmap == 61 || curmap == 65 || curmap == 56 || curmap > 66) && scriptflag[60][0] > 0) yp = 16; int s = npcinfo[i].bodysection[f].sprite; rcSrc.x = animset9[s].x; rcSrc.y = animset9[s].y + yp; @@ -2470,8 +2453,8 @@ void game_drawnpcs(int mode) // boss 1 - if(npcinfo[i].spriteset == 3) { - if(npcinfo[i].attacking == 0) { + if (npcinfo[i].spriteset == 3) { + if (npcinfo[i].attacking == 0) { int cframe = npcinfo[i].cframe; rcSrc.x = (int)(cframe / 4) * 24; @@ -2498,8 +2481,8 @@ void game_drawnpcs(int mode) } // black knight - if(npcinfo[i].spriteset == 4) { - if(npcinfo[i].attacking == 0) { + if (npcinfo[i].spriteset == 4) { + if (npcinfo[i].attacking == 0) { int cframe = npcinfo[i].cframe; rcSrc.x = (int)(cframe / 4) * 24; @@ -2526,9 +2509,9 @@ void game_drawnpcs(int mode) // firehydra - if(npcinfo[i].spriteset == 5) { - for(int ff = 0; ff <= 2; ff++) { - if(npcinfo[i].hp > 10 * ff * 20) { + if (npcinfo[i].spriteset == 5) { + for (int ff = 0; ff <= 2; ff++) { + if (npcinfo[i].hp > 10 * ff * 20) { rcSrc.x = 16 * (int)(RND() * 2); rcSrc.y = 80; rcSrc.w = 16; @@ -2538,12 +2521,12 @@ void game_drawnpcs(int mode) rcDest.y = npcinfo[i].bodysection[10 * ff].y - 8; int x = 192 + ((int)(itemyloc + ff * 5) % 3) * 64; - if(x > 255) x = 255; + if (x > 255) x = 255; SDL_SetAlpha(spellimg, SDL_SRCALPHA, x); SDL_BlitSurface(spellimg, &rcSrc, videobuffer, &rcDest); SDL_SetAlpha(spellimg, SDL_SRCALPHA, 255); - for(int f = 1; f <= 8; f++) { + for (int f = 1; f <= 8; f++) { rcSrc.x = 16 * (int)(RND() * 2); rcSrc.y = 80; rcSrc.w = 16; @@ -2553,7 +2536,7 @@ void game_drawnpcs(int mode) rcDest.y = npcinfo[i].bodysection[ff * 10 + f].y - 8 + (int)(RND() * 3) - 1; x = 192 + f % 3 * 64; - if(x > 255) x = 255; + if (x > 255) x = 255; SDL_SetAlpha(spellimg, SDL_SRCALPHA, x); SDL_BlitSurface(spellimg, &rcSrc, videobuffer, &rcDest); SDL_SetAlpha(spellimg, SDL_SRCALPHA, 255); @@ -2578,7 +2561,7 @@ void game_drawnpcs(int mode) } // red dragon - if(npcinfo[i].spriteset == 6) { + if (npcinfo[i].spriteset == 6) { int cframe = npcinfo[i].cframe; rcSrc.x = (int)(cframe / 4) * 24; @@ -2591,7 +2574,7 @@ void game_drawnpcs(int mode) rcDest.w = 24; rcDest.h = 24; - if(npcinfo[i].pause > ticks && npcinfo[i].shake < ticks) { + if (npcinfo[i].pause > ticks && npcinfo[i].shake < ticks) { npcinfo[i].shake = ticks + 50; rcDest.x = rcDest.x + (int)(RND() * 3) - 1; rcDest.y = rcDest.y + (int)(RND() * 3) - 1; @@ -2601,45 +2584,45 @@ void game_drawnpcs(int mode) } // wizard - if(npcinfo[i].spriteset == 7) { + if (npcinfo[i].spriteset == 7) { // if(npcinfo[i].attacking == 0) { - int cframe = npcinfo[i].cframe; + int cframe = npcinfo[i].cframe; - rcSrc.x = (int)(cframe / 4) * 24; - rcSrc.y = wdir * 24; - rcSrc.w = 24; - rcSrc.h = 24; + rcSrc.x = (int)(cframe / 4) * 24; + rcSrc.y = wdir * 24; + rcSrc.w = 24; + rcSrc.h = 24; - rcDest.x = npx; - rcDest.y = npy; - rcDest.w = 24; - rcDest.h = 24; + rcDest.x = npx; + rcDest.y = npy; + rcDest.w = 24; + rcDest.h = 24; - if(npcinfo[i].pause > ticks && npcinfo[i].shake < ticks) { - npcinfo[i].shake = ticks + 50; - rcDest.x = rcDest.x + (int)(RND() * 3) - 1; - rcDest.y = rcDest.y + (int)(RND() * 3) - 1; - } - SDL_BlitSurface(anims[sprite], &rcSrc, videobuffer, &rcDest); + if (npcinfo[i].pause > ticks && npcinfo[i].shake < ticks) { + npcinfo[i].shake = ticks + 50; + rcDest.x = rcDest.x + (int)(RND() * 3) - 1; + rcDest.y = rcDest.y + (int)(RND() * 3) - 1; + } + SDL_BlitSurface(anims[sprite], &rcSrc, videobuffer, &rcDest); // } else { - //cframe = npcinfo[i].cattackframe; + //cframe = npcinfo[i].cattackframe; - //rcSrc.x = (int)(cframe / 4) * 24; - //rcSrc.y = wdir * 24; - //rcSrc.w = 24; - //rcSrc.h = 24; + //rcSrc.x = (int)(cframe / 4) * 24; + //rcSrc.y = wdir * 24; + //rcSrc.w = 24; + //rcSrc.h = 24; - //rcDest.x = npx; - //rcDest.y = npy; - //rcDest.w = 24; - //rcDest.h = 24; + //rcDest.x = npx; + //rcDest.y = npy; + //rcDest.w = 24; + //rcDest.h = 24; // SDL_BlitSurface(animsa(sprite), &rcSrc, videobuffer, &rcDest); // } } // yellow dragon - if(npcinfo[i].spriteset == 8) { + if (npcinfo[i].spriteset == 8) { int cframe = npcinfo[i].cframe; rcSrc.x = (int)(cframe / 4) * 24; @@ -2652,7 +2635,7 @@ void game_drawnpcs(int mode) rcDest.w = 24; rcDest.h = 24; - if(npcinfo[i].pause > ticks && npcinfo[i].shake < ticks) { + if (npcinfo[i].pause > ticks && npcinfo[i].shake < ticks) { npcinfo[i].shake = ticks + 50; rcDest.x = rcDest.x + (int)(RND() * 3) - 1; rcDest.y = rcDest.y + (int)(RND() * 3) - 1; @@ -2662,21 +2645,21 @@ void game_drawnpcs(int mode) // dragon2 - if(npcinfo[i].spriteset == 10) { - if(npcinfo[i].attacking == 0) { + if (npcinfo[i].spriteset == 10) { + if (npcinfo[i].attacking == 0) { npcinfo[i].floating = npcinfo[i].floating + 0.25 * fpsr; - while(npcinfo[i].floating >= 16) npcinfo[i].floating = npcinfo[i].floating - 16; + while (npcinfo[i].floating >= 16) npcinfo[i].floating = npcinfo[i].floating - 16; float frame = npcinfo[i].frame; int cframe = npcinfo[i].cframe; frame = frame + 0.5 * fpsr; - while(frame >= 16) + while (frame >= 16) frame = frame - 16; cframe = (int)(frame); - if(cframe > 16) cframe = 16 - 1; - if(cframe < 0) cframe = 0; + if (cframe > 16) cframe = 16 - 1; + if (cframe < 0) cframe = 0; npcinfo[i].frame = frame; npcinfo[i].cframe = cframe; @@ -2693,7 +2676,7 @@ void game_drawnpcs(int mode) rcDest.w = 24; rcDest.h = 24; - if(npcinfo[i].pause > ticks && npcinfo[i].shake < ticks) { + if (npcinfo[i].pause > ticks && npcinfo[i].shake < ticks) { npcinfo[i].shake = ticks + 50; rcDest.x = rcDest.x + (int)(RND() * 3) - 1; rcDest.y = rcDest.y + (int)(RND() * 3) - 1; @@ -2702,7 +2685,7 @@ void game_drawnpcs(int mode) SDL_BlitSurface(anims[sprite], &rcSrc, videobuffer, &rcDest); } else { npcinfo[i].floating = npcinfo[i].floating + 0.25 * fpsr; - while(npcinfo[i].floating >= 16) npcinfo[i].floating = npcinfo[i].floating - 16; + while (npcinfo[i].floating >= 16) npcinfo[i].floating = npcinfo[i].floating - 16; int cframe = npcinfo[i].cattackframe; @@ -2721,16 +2704,16 @@ void game_drawnpcs(int mode) } // end boss - if(npcinfo[i].spriteset == 11) { + if (npcinfo[i].spriteset == 11) { npcinfo[i].floating = npcinfo[i].floating + .3 * fpsr; - while(npcinfo[i].floating >= 16) npcinfo[i].floating = npcinfo[i].floating - 16; + while (npcinfo[i].floating >= 16) npcinfo[i].floating = npcinfo[i].floating - 16; float frame = npcinfo[i].frame2; frame = frame + 0.5 * fpsr; - while(frame >= 16) + while (frame >= 16) frame = frame - 16; npcinfo[i].frame2 = frame; @@ -2738,7 +2721,7 @@ void game_drawnpcs(int mode) int sx = npx + 12 - 40; int sy = (float)(npy + 12 - 50 - 3 * sin(3.141592 * 2 * npcinfo[i].floating / 16)); - for(int fr = 0; fr <= 3; fr++) { + for (int fr = 0; fr <= 3; fr++) { SDL_SetAlpha(spellimg, SDL_SRCALPHA, 128 + (int)(RND() * 96)); rcSrc.x = 16 * (int)(RND() * 2); @@ -2752,15 +2735,15 @@ void game_drawnpcs(int mode) SDL_BlitSurface(spellimg, &rcSrc, videobuffer, &rcDest); } - for(int ii = 0; ii <= 8; ii++) { - for(int i2 = 0; i2 <= 3; i2++) { + for (int ii = 0; ii <= 8; ii++) { + for (int i2 = 0; i2 <= 3; i2++) { rcSrc.x = 16 * (int)(RND() * 2); rcSrc.y = 80; rcSrc.w = 16; rcSrc.h = 16; float fr3 = frame - 3 + i2; - if(fr3 < 0) fr3 = fr3 + 16; + if (fr3 < 0) fr3 = fr3 + 16; rcDest.x = (float)(sx + 36 + ii * 8 - ii * cos(3.14159 * 2 * (fr3 - ii) / 16) * 2); rcDest.y = (float)(sy + 16 + ii * sin(3.14159 * 2 * (fr3 - ii) / 16) * 3 - ii); // * 4 @@ -2774,12 +2757,12 @@ void game_drawnpcs(int mode) int xdif = (xloc + 8) - (player.px + 12); int ydif = (yloc + 8) - (player.py + 12); - if((abs(xdif) < 8 && abs(ydif) < 8) && player.pause < ticks) { + if ((abs(xdif) < 8 && abs(ydif) < 8) && player.pause < ticks) { float damage = (float)npcinfo[i].spelldamage * (1.0 + RND() * 0.5); - if(player.hp > 0) { + if (player.hp > 0) { game_damageplayer(damage); - if(menabled == 1 && config.effects == 1) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndfire], 0); Mix_Volume(snd, config.effectsvol); } @@ -2800,12 +2783,12 @@ void game_drawnpcs(int mode) xdif = (xloc + 8) - (player.px + 12); ydif = (yloc + 8) - (player.py + 12); - if((abs(xdif) < 8 && abs(ydif) < 8) && player.pause < ticks) { + if ((abs(xdif) < 8 && abs(ydif) < 8) && player.pause < ticks) { float damage = (float)npcinfo[i].spelldamage * (1.0 + RND() * 0.5); - if(player.hp > 0) { + if (player.hp > 0) { game_damageplayer(damage); - if(menabled == 1 && config.effects == 1) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndfire], 0); Mix_Volume(snd, config.effectsvol); } @@ -2816,7 +2799,7 @@ void game_drawnpcs(int mode) SDL_SetAlpha(spellimg, SDL_SRCALPHA, 255); - if(npcinfo[i].attacking == 0) { + if (npcinfo[i].attacking == 0) { int cframe = (int)(frame); rcSrc.x = 0; rcSrc.y = 72 * (int)(cframe / 4); @@ -2826,7 +2809,7 @@ void game_drawnpcs(int mode) rcDest.x = sx; rcDest.y = sy; - if(npcinfo[i].pause > ticks && npcinfo[i].shake < ticks) { + if (npcinfo[i].pause > ticks && npcinfo[i].shake < ticks) { npcinfo[i].shake = ticks + 50; rcDest.x = rcDest.x + (int)(RND() * 3) - 1; rcDest.y = rcDest.y + (int)(RND() * 3) - 1; @@ -2849,20 +2832,20 @@ void game_drawnpcs(int mode) } // bat kitty - if(npcinfo[i].spriteset == 12) { + if (npcinfo[i].spriteset == 12) { npcinfo[i].floating = npcinfo[i].floating + 1 * fpsr; - while(npcinfo[i].floating >= 16) npcinfo[i].floating = npcinfo[i].floating - 16; + while (npcinfo[i].floating >= 16) npcinfo[i].floating = npcinfo[i].floating - 16; float frame = npcinfo[i].frame; int cframe = npcinfo[i].cframe; frame = frame + 0.5 * fpsr; - while(frame >= 16) + while (frame >= 16) frame = frame - 16; cframe = (int)(frame); - if(cframe > 16) cframe = 16 - 1; - if(cframe < 0) cframe = 0; + if (cframe > 16) cframe = 16 - 1; + if (cframe < 0) cframe = 0; npcinfo[i].frame = frame; npcinfo[i].cframe = cframe; @@ -2879,7 +2862,7 @@ void game_drawnpcs(int mode) rcDest.w = 99; rcDest.h = 80; - if(npcinfo[i].pause > ticks && npcinfo[i].shake < ticks) { + if (npcinfo[i].pause > ticks && npcinfo[i].shake < ticks) { npcinfo[i].shake = ticks + 50; rcDest.x = rcDest.x + (int)(RND() * 3) - 1; rcDest.y = rcDest.y + (int)(RND() * 3) - 1; @@ -2900,8 +2883,8 @@ void game_drawnpcs(int mode) int ww = 14 * npcinfo[i].hp / npcinfo[i].maxhp; - if(ww > 14) ww = 14; - if(ww < 1) ww = 1; + if (ww > 14) ww = 14; + if (ww < 1) ww = 1; rcDest.w = ww; rcDest.h = 2; @@ -2911,24 +2894,23 @@ void game_drawnpcs(int mode) int pass = 1; - if(npcinfo[i].spriteset == 3) pass = 0; - if(pass == 1) game_drawover(npx, npy); + if (npcinfo[i].spriteset == 3) pass = 0; + if (pass == 1) game_drawover(npx, npy); } } } } -void game_drawover(int modx, int mody) -{ +void game_drawover(int modx, int mody) { int npx = modx + 12; int npy = mody + 20; int lx = (int)npx / 16; int ly = (int)npy / 16; - for(int xo = -1; xo <= 1; xo++) { - for(int yo = -1; yo <= 1; yo++) { + for (int xo = -1; xo <= 1; xo++) { + for (int yo = -1; yo <= 1; yo++) { int sx = lx + xo; int sy = ly + yo; @@ -2936,12 +2918,12 @@ void game_drawover(int modx, int mody) int sx2 = sx * 16; int sy2 = sy * 16; - if(sx > -1 && sx < 40 && sy > -1 && sy < 24) { + if (sx > -1 && sx < 40 && sy > -1 && sy < 24) { int curtile = tileinfo[2][sx][sy][0]; int curtilel = tileinfo[2][sx][sy][1]; - if(curtile > 0) { + if (curtile > 0) { curtile = curtile - 1; int curtilex = curtile % 20; int curtiley = (curtile - curtilex) / 20; @@ -2957,29 +2939,28 @@ void game_drawover(int modx, int mody) rcDest.h = 16; int pass = 1; - if(curtilel == 1) { - for(int ff = 0; ff <= 5; ff++) { + if (curtilel == 1) { + for (int ff = 0; ff <= 5; ff++) { int ffa = 20 * 5 - 1 + ff * 20; int ffb = 20 * 5 + 4 + ff * 20; - if(curtile > ffa && curtile < ffb) pass = 0; + if (curtile > ffa && curtile < ffb) pass = 0; } } - if(pass == 1) SDL_BlitSurface(tiles[curtilel], &rcSrc, videobuffer, &rcDest); + if (pass == 1) SDL_BlitSurface(tiles[curtilel], &rcSrc, videobuffer, &rcDest); } } } } } -void game_drawplayer() -{ +void game_drawplayer() { long ccc; int f = 0; - if(player.armour == 3) f = 13; + if (player.armour == 3) f = 13; - if(attacking == 0) { + if (attacking == 0) { rcSrc.x = (int)(player.walkframe / 4) * 24; rcSrc.y = player.walkdir * 24; rcSrc.w = 24; @@ -3009,15 +2990,15 @@ void game_drawplayer() ccc = SDL_MapRGB(videobuffer->format, 224, 224, 64); int pass = 0; - if(player.hp <= player.maxhp * 0.25) pass = 1; + if (player.hp <= player.maxhp * 0.25) pass = 1; - if(pass == 1) { + if (pass == 1) { ccc = SDL_MapRGB(videobuffer->format, 255, 255, 255); - if((int)(player.hpflash) == 1) ccc = SDL_MapRGB(videobuffer->format, 255, 0, 0); + if ((int)(player.hpflash) == 1) ccc = SDL_MapRGB(videobuffer->format, 255, 0, 0); } int sss = 6; - if(player.foundspell[0]) sss = 8; + if (player.foundspell[0]) sss = 8; int npx = player.px; int npy = player.py; rcDest.x = npx + 4; @@ -3032,8 +3013,8 @@ void game_drawplayer() int ww = 14 * player.hp / player.maxhp; - if(ww > 14) ww = 14; - if(ww < 1) ww = 1; + if (ww > 14) ww = 14; + if (ww < 1) ww = 1; rcDest.w = ww; rcDest.h = 2; @@ -3041,13 +3022,13 @@ void game_drawplayer() SDL_FillRect(videobuffer, &rcDest, ccc); ccc = SDL_MapRGB(videobuffer->format, 0, 224, 64); - if(player.attackstrength == 100) ccc = SDL_MapRGB(videobuffer->format, 255, 128, 32); + if (player.attackstrength == 100) ccc = SDL_MapRGB(videobuffer->format, 255, 128, 32); ww = 14 * player.attackstrength / 100; - if(ww > 14) ww = 14; + if (ww > 14) ww = 14; int ww2 = 14 * player.spellstrength / 100; - if(ww2 > 14) ww2 = 14; + if (ww2 > 14) ww2 = 14; rcDest.w = ww; rcDest.h = 2; @@ -3056,7 +3037,7 @@ void game_drawplayer() SDL_FillRect(videobuffer, &rcDest, ccc); ccc = SDL_MapRGB(videobuffer->format, 128, 0, 224); - if(player.spellstrength == 100) ccc = SDL_MapRGB(videobuffer->format, 224, 0, 0); + if (player.spellstrength == 100) ccc = SDL_MapRGB(videobuffer->format, 224, 0, 0); rcDest.w = ww2; rcDest.h = 2; @@ -3065,8 +3046,7 @@ void game_drawplayer() SDL_FillRect(videobuffer, &rcDest, ccc); } -void game_drawview() -{ +void game_drawview() { SDL_Rect rc; SDL_BlitSurface(mapbg, NULL, videobuffer, NULL); @@ -3076,19 +3056,19 @@ void game_drawview() game_drawanims(0); // ------dontdrawover = special case to make boss work right in room 24 - if(dontdrawover == 1) game_drawanims(1); + if (dontdrawover == 1) game_drawanims(1); game_drawnpcs(0); game_drawplayer(); game_drawnpcs(1); - if(dontdrawover == 0) game_drawanims(1); + if (dontdrawover == 0) game_drawanims(1); game_drawover((int)player.px, (int)player.py); game_updspells(); - if(cloudson == 1) { + if (cloudson == 1) { rc.x = (float)(256 + 256 * cos(3.141592 / 180 * clouddeg)); rc.y = (float)(192 + 192 * sin(3.141592 / 180 * clouddeg)); rc.w = 320; @@ -3102,8 +3082,7 @@ void game_drawview() SDL_BLITVIDEO(videobuffer, NULL, video, NULL); } -void game_endofgame() -{ +void game_endofgame() { float xofs = 0; int ticks1; @@ -3111,7 +3090,7 @@ void game_endofgame() float spd = 0.2; - if(menabled == 1 && config.music == 1) { + if (menabled == 1 && config.music == 1) { Mix_HaltChannel(-1); musicchannel = Mix_PlayChannel(-1, mendofgame, -1); Mix_Volume(musicchannel, 0); @@ -3129,17 +3108,17 @@ void game_endofgame() do { ld = ld + 4 * fpsr; - if(ld > config.musicvol) ld = config.musicvol; - if(menabled == 1 && ldstop == 0) { + if (ld > config.musicvol) ld = config.musicvol; + if (menabled == 1 && ldstop == 0) { Mix_Volume(musicchannel, (int)ld); - if((int)ld == config.musicvol) ldstop = 1; + if ((int)ld == config.musicvol) ldstop = 1; } ya = 0; - if(ticks < ticks1 + 1500) { + if (ticks < ticks1 + 1500) { ya = (255 * (ticks - ticks1)) / 1500; - if(ya < 0) ya = 0; - if(ya > 255) ya = 255; + if (ya < 0) ya = 0; + if (ya > 255) ya = 255; } else { break; } @@ -3162,12 +3141,12 @@ void game_endofgame() fpsr = (float)tickspassed / 24; fp++; - if(ticks > nextticks) { + if (ticks > nextticks) { nextticks = ticks + 1000; fps = fp; fp = 0; } - } while(1); + } while (1); ticks1 = ticks; ya = 0; @@ -3176,32 +3155,32 @@ void game_endofgame() do { SDL_Rect rc; - rc.x = -xofs; + rc.x = -xofs; rc.y = 0; SDL_BlitSurface(titleimg, NULL, videobuffer, &rc); - rc.x = -xofs + 320; + rc.x = -xofs + 320; rc.y = 0; SDL_BlitSurface(titleimg, NULL, videobuffer, &rc); y = y - spd * fpsr; - for(int i = 0; i <= 26; i++) { + for (int i = 0; i <= 26; i++) { int yy = y + i * 10; - if(yy > -8 && yy < 240) { + if (yy > -8 && yy < 240) { int x = 160 - strlen(story2[i]) * 4; sys_print(videobuffer, story2[i], x, yy, 4); } - if(yy < 10 && i == 25) break; + if (yy < 10 && i == 25) break; } int ya = 255; - if(ticks < ticks1 + 1000) { + if (ticks < ticks1 + 1000) { ya = 255 * (ticks - ticks1) / 1000; - if(ya < 0) ya = 0; - if(ya > 255) ya = 255; + if (ya < 0) ya = 0; + if (ya > 255) ya = 255; } SDL_SetAlpha(videobuffer, SDL_SRCALPHA, ya); @@ -3218,25 +3197,25 @@ void game_endofgame() fpsr = (float)tickspassed / 24; fp++; - if(ticks > nextticks) { + if (ticks > nextticks) { nextticks = ticks + 1000; fps = fp; fp = 0; } float add = 0.5 * fpsr; - if(add > 1) add = 1; + if (add > 1) add = 1; xofs = xofs + add; - if(xofs >= 320) xofs = xofs - 320; + if (xofs >= 320) xofs = xofs - 320; SDL_PollEvent(&event); keys = SDL_GetKeyState(NULL); - if(event.type == SDL_KEYDOWN) spd = 1; - if(event.type == SDL_KEYUP) spd = 0.2; + if (event.type == SDL_KEYDOWN) spd = 1; + if (event.type == SDL_KEYUP) spd = 0.2; - if(keys[SDLK_ESCAPE] || keys[SDLK_LALT]) break; - } while(1); + if (keys[SDLK_ESCAPE] || keys[SDLK_LALT]) break; + } while (1); ticks1 = ticks; @@ -3245,12 +3224,12 @@ void game_endofgame() SDL_BlitSurface(videobuffer, NULL, videobuffer2, NULL); do { - if(ticks < ticks1 + 1500) { + if (ticks < ticks1 + 1500) { int y = 255 * (ticks - ticks1) / 1500; - if(y < 0) y = 0; - if(y > 255) y = 255; - else - break; + if (y < 0) y = 0; + if (y > 255) y = 255; + else + break; } SDL_FillRect(videobuffer, NULL, 0); @@ -3271,12 +3250,12 @@ void game_endofgame() fpsr = (float)tickspassed / 24; fp++; - if(ticks > nextticks) { + if (ticks > nextticks) { nextticks = ticks + 1000; fps = fp; fp = 0; } - } while(1); + } while (1); int keywait = 2000 + ticks; @@ -3288,10 +3267,10 @@ void game_endofgame() SDL_BlitSurface(theendimg, NULL, videobuffer, NULL); y = 255; - if(ticks < ticks1 + 1000) { + if (ticks < ticks1 + 1000) { y = 255 * (ticks - ticks1) / 1000; - if(y < 0) y = 0; - if(y > 255) y = 255; + if (y < 0) y = 0; + if (y > 255) y = 255; } SDL_SetAlpha(videobuffer, SDL_SRCALPHA, y); @@ -3308,7 +3287,7 @@ void game_endofgame() fpsr = (float)tickspassed / 24; fp++; - if(ticks > nextticks) { + if (ticks > nextticks) { nextticks = ticks + 1000; fps = fp; fp = 0; @@ -3317,9 +3296,9 @@ void game_endofgame() SDL_PollEvent(&event); keys = SDL_GetKeyState(NULL); - if(event.type == SDL_KEYDOWN && keywait < ticks) break; + if (event.type == SDL_KEYDOWN && keywait < ticks) break; - } while(1); + } while (1); SDL_FillRect(videobuffer2, NULL, 0); SDL_FillRect(videobuffer3, NULL, 0); @@ -3328,8 +3307,7 @@ void game_endofgame() } -void game_eventtext(char *stri) -{ +void game_eventtext(char *stri) { int x, fr, pauseticks, bticks; SDL_FillRect(videobuffer2, NULL, 0); @@ -3348,18 +3326,18 @@ void game_eventtext(char *stri) SDL_PollEvent(&event); keys = SDL_GetKeyState(NULL); - if(event.type == SDL_KEYDOWN && pauseticks < ticks) break; + if (event.type == SDL_KEYDOWN && pauseticks < ticks) break; SDL_BlitSurface(videobuffer2, NULL, videobuffer, NULL); fr = 192; - if(pauseticks > ticks) fr = 192 * (ticks - bticks) / 500; - if(fr > 192) fr = 192; + if (pauseticks > ticks) fr = 192 * (ticks - bticks) / 500; + if (fr > 192) fr = 192; SDL_SetAlpha(windowimg, SDL_SRCALPHA, fr); SDL_BlitSurface(windowimg, NULL, videobuffer, NULL); - if(pauseticks < ticks) sys_print(videobuffer, stri, x, 15, 0); + if (pauseticks < ticks) sys_print(videobuffer, stri, x, 15, 0); SDL_SetAlpha(windowimg, SDL_SRCALPHA, 255); SDL_BLITVIDEO(videobuffer, NULL, video, NULL); @@ -3374,14 +3352,14 @@ void game_eventtext(char *stri) fpsr = (float)tickspassed / 24.0; fp++; - if(ticks > nextticks) { + if (ticks > nextticks) { nextticks = ticks + 1000; fps = fp; fp = 0; } SDL_Delay(10); - } while(1); + } while (1); SDL_BlitSurface(videobuffer3, NULL, videobuffer, NULL); @@ -3389,8 +3367,7 @@ void game_eventtext(char *stri) } -void game_handlewalking() -{ +void game_handlewalking() { unsigned int *temp/*, c*/, bgc; float spd, /*ppx, ppy,*/ px, py, opx, opy; float nx, ny, npx, npy; @@ -3414,102 +3391,102 @@ void game_handlewalking() int ly = (int)npy / 16; int ramp = rampdata[lx][ly]; - if(ramp == 1 && movingup) spd = spd * 2; - if(ramp == 1 && movingdown) spd = spd * 2; + if (ramp == 1 && movingup) spd = spd * 2; + if (ramp == 1 && movingdown) spd = spd * 2; - if(ramp == 2 && movingleft) movingup = 1; - if(ramp == 2 && movingright) movingdown = 1; + if (ramp == 2 && movingleft) movingup = 1; + if (ramp == 2 && movingright) movingdown = 1; - if(ramp == 3 && movingright) movingup = 1; - if(ramp == 3 && movingleft) movingdown = 1; + if (ramp == 3 && movingright) movingup = 1; + if (ramp == 3 && movingleft) movingdown = 1; - for(int x = -1; x <= 1; x++) { - for(int y = -1; y <= 1; y++) { + for (int x = -1; x <= 1; x++) { + for (int y = -1; y <= 1; y++) { int sx = nx + x; int sy = ny + y; clipsurround[x + 1][y + 1] = 0; - if(sx > -1 && sx < 320 && sy > -1 && sy < 192) { + if (sx > -1 && sx < 320 && sy > -1 && sy < 192) { temp = clipbg->pixels + sy * clipbg->pitch + sx * clipbg->format->BytesPerPixel; clipsurround[x + 1][y + 1] = *temp; } } } - if(movingup) player.walkdir = 0; - if(movingdown) player.walkdir = 1; - if(movingleft) player.walkdir = 2; - if(movingright) player.walkdir = 3; + if (movingup) player.walkdir = 0; + if (movingdown) player.walkdir = 1; + if (movingleft) player.walkdir = 2; + if (movingright) player.walkdir = 3; - if(movingup && clipsurround[1][0] == 0) { + if (movingup && clipsurround[1][0] == 0) { py = py - spd; player.walkdir = 0; - } else if(movingup && clipsurround[1][0] > 0) { + } else if (movingup && clipsurround[1][0] > 0) { // move upleft - if(movingright == 0 && clipsurround[0][0] == 0) { + if (movingright == 0 && clipsurround[0][0] == 0) { py = py - spd; px = px - spd; } // move upright - if(movingleft == 0 && clipsurround[2][0] == 0) { + if (movingleft == 0 && clipsurround[2][0] == 0) { py = py - spd; px = px + spd; } } - if(movingdown && clipsurround[1][2] == 0) { + if (movingdown && clipsurround[1][2] == 0) { py = py + spd; player.walkdir = 1; - } else if(movingdown && clipsurround[1][2] > 0) { + } else if (movingdown && clipsurround[1][2] > 0) { // move downleft - if(movingright == 0 && clipsurround[0][2] == 0) { + if (movingright == 0 && clipsurround[0][2] == 0) { py = py + spd; px = px - spd; } // move downright - if(movingleft == 0 && clipsurround[2][2] == 0) { + if (movingleft == 0 && clipsurround[2][2] == 0) { py = py + spd; px = px + spd; } } - if(movingleft && clipsurround[0][1] == 0) { + if (movingleft && clipsurround[0][1] == 0) { px = px - spd; player.walkdir = 2; - } else if(movingleft && clipsurround[0][1] > 0) { + } else if (movingleft && clipsurround[0][1] > 0) { // move leftup - if(movingdown == 0 && clipsurround[0][0] == 0) { + if (movingdown == 0 && clipsurround[0][0] == 0) { py = py - spd; px = px - spd; } // move leftdown - if(movingup == 0 && clipsurround[0][2] == 0) { + if (movingup == 0 && clipsurround[0][2] == 0) { py = py + spd; px = px - spd; } } - if(movingright && clipsurround[2][1] == 0) { + if (movingright && clipsurround[2][1] == 0) { px = px + spd; player.walkdir = 3; - } else if(movingright && clipsurround[2][1] > 0) { + } else if (movingright && clipsurround[2][1] > 0) { // move rightup - if(movingdown == 0 && clipsurround[2][0] == 0) { + if (movingdown == 0 && clipsurround[2][0] == 0) { px = px + spd; py = py - spd; } // move rightdown - if(movingup == 0 && clipsurround[2][2] == 0) { + if (movingup == 0 && clipsurround[2][2] == 0) { py = py + spd; px = px + spd; } } - if(px < -8) px = -8; - if(px > xmax) px = xmax; - if(py < -8) py = -8; - if(py > ymax) py = ymax; + if (px < -8) px = -8; + if (px > xmax) px = xmax; + if (py < -8) py = -8; + if (py > ymax) py = ymax; int pass = 1; @@ -3517,16 +3494,16 @@ void game_handlewalking() int sy = (py / 2 + 10); temp = clipbg->pixels + sy * clipbg->pitch + sx * clipbg->format->BytesPerPixel; bgc = *temp; - if(bgc > 0 && bgc != 1000) { + if (bgc > 0 && bgc != 1000) { px = opx; py = opy; pass = 0; } // push npc - if(pass == 1) { - for(int i = 1; i <= lastnpc; i++) { - if(npcinfo[i].hp > 0) { + if (pass == 1) { + for (int i = 1; i <= lastnpc; i++) { + if (npcinfo[i].hp > 0) { npx = npcinfo[i].x; npy = npcinfo[i].y; @@ -3536,14 +3513,14 @@ void game_handlewalking() int xdif = player.px - npx; int ydif = player.py - npy; - if(player.walkdir == 0) { - if(abs(xdif) <= 8 && ydif > 0 && ydif < 8) npcinfo[i].y = npcinfo[i].y - spd; - } else if(player.walkdir == 1) { - if(abs(xdif) <= 8 && ydif < 0 && ydif > -8) npcinfo[i].y = npcinfo[i].y + spd; - } else if(player.walkdir == 2) { - if(abs(ydif) <= 8 && xdif > 0 && xdif < 8) npcinfo[i].x = npcinfo[i].x - spd; - } else if(player.walkdir == 3) { - if(abs(ydif) <= 8 && xdif < 0 && xdif > -8) npcinfo[i].x = npcinfo[i].x + spd; + if (player.walkdir == 0) { + if (abs(xdif) <= 8 && ydif > 0 && ydif < 8) npcinfo[i].y = npcinfo[i].y - spd; + } else if (player.walkdir == 1) { + if (abs(xdif) <= 8 && ydif < 0 && ydif > -8) npcinfo[i].y = npcinfo[i].y + spd; + } else if (player.walkdir == 2) { + if (abs(ydif) <= 8 && xdif > 0 && xdif < 8) npcinfo[i].x = npcinfo[i].x - spd; + } else if (player.walkdir == 3) { + if (abs(ydif) <= 8 && xdif < 0 && xdif > -8) npcinfo[i].x = npcinfo[i].x + spd; } npx = npcinfo[i].x; @@ -3554,7 +3531,7 @@ void game_handlewalking() temp = clipbg->pixels + sy * clipbg->pitch + sx * clipbg->format->BytesPerPixel; bgc = *temp; - if(bgc > 0) { + if (bgc > 0) { npcinfo[i].x = opx; npcinfo[i].y = opy; } @@ -3567,15 +3544,15 @@ void game_handlewalking() player.px = px; player.py = py; - if(player.px != player.opx || player.py != player.opy) player.walkframe = player.walkframe + animspd * fpsr; - if(player.walkframe >= 16) player.walkframe = player.walkframe - 16; + if (player.px != player.opx || player.py != player.opy) player.walkframe = player.walkframe + animspd * fpsr; + if (player.walkframe >= 16) player.walkframe = player.walkframe - 16; // walking over items to pickup ::: int o = objmap[lx][ly]; - if(o > -1) { + if (o > -1) { // fsk - if(objectinfo[o][4] == 2 && player.inventory[INV_FLASK] < 9) { + if (objectinfo[o][4] == 2 && player.inventory[INV_FLASK] < 9) { objmap[lx][ly] = -1; player.inventory[INV_FLASK]++; @@ -3583,13 +3560,13 @@ void game_handlewalking() objmapf[curmap][lx][ly] = 1; - if(menabled == 1 && config.effects == 1) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndpowerup], 0); Mix_Volume(snd, config.effectsvol); } } - if(objectinfo[o][5] == 7 && player.inventory[INV_DOUBLEFLASK] < 9) { + if (objectinfo[o][5] == 7 && player.inventory[INV_DOUBLEFLASK] < 9) { objmap[lx][ly] = -1; player.inventory[INV_DOUBLEFLASK]++; @@ -3597,29 +3574,29 @@ void game_handlewalking() objmapf[curmap][lx][ly] = 1; - if(menabled == 1 && config.effects == 1) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndpowerup], 0); Mix_Volume(snd, config.effectsvol); } } - if(objectinfo[o][5] == 9 && player.inventory[INV_SHOCK] < 9 && (curmap == 41 && scriptflag[9][1] == 0)) { + if (objectinfo[o][5] == 9 && player.inventory[INV_SHOCK] < 9 && (curmap == 41 && scriptflag[9][1] == 0)) { objmap[lx][ly] = -1; player.inventory[INV_SHOCK]++; game_addFloatIcon(17, lx * 16, ly * 16); objmapf[curmap][lx][ly] = 1; - if(curmap == 41) scriptflag[9][1] = 1; + if (curmap == 41) scriptflag[9][1] = 1; - if(menabled == 1 && config.effects == 1) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndpowerup], 0); Mix_Volume(snd, config.effectsvol); } } - if(objectinfo[o][5] == 9 && player.inventory[INV_SHOCK] < 9) { + if (objectinfo[o][5] == 9 && player.inventory[INV_SHOCK] < 9) { objmap[lx][ly] = -1; player.inventory[INV_SHOCK]++; @@ -3627,7 +3604,7 @@ void game_handlewalking() objmapf[curmap][lx][ly] = 1; - if(menabled == 1 && config.effects == 1) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndpowerup], 0); Mix_Volume(snd, config.effectsvol); } @@ -3636,20 +3613,19 @@ void game_handlewalking() } } -void game_loadmap(int mapnum) -{ +void game_loadmap(int mapnum) { unsigned int ccc; SDL_Rect trect; FILE *fp; char name[256]; int tempmap[320][200]; - ccc = SDL_MapRGB(clipbg->format, 255,255,255); + ccc = SDL_MapRGB(clipbg->format, 255, 255, 255); curmap = mapnum; trect.x = 0; - trect.y = 0; + trect.y = 0; trect.w = 320; trect.h = 240; SDL_FillRect(mapbg, &trect, 0); @@ -3658,50 +3634,52 @@ void game_loadmap(int mapnum) forcepause = 0; cloudson = 0; - if(mapnum < 6) cloudson = 1; - if(mapnum > 41) cloudson = 1; - if(mapnum > 47) cloudson = 0; - if(mapnum == 52) cloudson = 1; - if(mapnum == 60) cloudson = 1; - if(mapnum == 50) cloudson = 1; - if(mapnum == 54) cloudson = 1; - if(mapnum == 58) cloudson = 1; - if(mapnum == 62) cloudson = 1; - if(mapnum == 83) cloudson = 1; + if (mapnum < 6) cloudson = 1; + if (mapnum > 41) cloudson = 1; + if (mapnum > 47) cloudson = 0; + if (mapnum == 52) cloudson = 1; + if (mapnum == 60) cloudson = 1; + if (mapnum == 50) cloudson = 1; + if (mapnum == 54) cloudson = 1; + if (mapnum == 58) cloudson = 1; + if (mapnum == 62) cloudson = 1; + if (mapnum == 83) cloudson = 1; // -----------special case dontdrawover = 0; - if(mapnum == 24) dontdrawover = 1; + if (mapnum == 24) dontdrawover = 1; - if((mapnum == 53 || mapnum == 57 || mapnum == 61 || mapnum == 65 || mapnum == 62) && scriptflag[60][0] > 0) mapnum = mapnum + 100; - if((mapnum == 161 || mapnum == 162) && scriptflag[60][0] == 2) mapnum = mapnum + 100; + if ((mapnum == 53 || mapnum == 57 || mapnum == 61 || mapnum == 65 || mapnum == 62) && scriptflag[60][0] > 0) mapnum = mapnum + 100; + if ((mapnum == 161 || mapnum == 162) && scriptflag[60][0] == 2) mapnum = mapnum + 100; - for(int i = 0; i < MAXSPELL; i++) + for (int i = 0; i < MAXSPELL; i++) spellinfo[i].frame = 0; roomlock = 0; // read *.map file - sprintf(name, "mapdb/%04i.map", mapnum); printf("Reading %s\n", name); + sprintf(name, "mapdb/%04i.map", mapnum); + printf("Reading %s\n", name); fp = fopen(name, "r"); - for(int x = 0; x <= 319; x++) - for(int y = 0; y <= 199; y++) { + for (int x = 0; x <= 319; x++) + for (int y = 0; y <= 199; y++) { INPUT("%i", &tempmap[x][y]); } fclose(fp); - for(int x = 0; x <= 319; x++) - for(int y = 0; y <= 239; y++) { + for (int x = 0; x <= 319; x++) + for (int y = 0; y <= 239; y++) { triggerloc[x][y] = -1; } // read *.trg file - sprintf(name, "mapdb/%04i.trg", mapnum); printf("Reading %s\n", name); + sprintf(name, "mapdb/%04i.trg", mapnum); + printf("Reading %s\n", name); fp = fopen(name, "r"); INPUT("%i", &ntriggers); - for(int i = 0; i < ntriggers; i++) { + for (int i = 0; i < ntriggers; i++) { int mapx, mapy, trig; INPUT("%i", &mapx); @@ -3713,26 +3691,26 @@ void game_loadmap(int mapnum) fclose(fp); - for(int y = 0; y <= 23; y++) - for(int x = 0; x <= 39; x++) + for (int y = 0; y <= 23; y++) + for (int x = 0; x <= 39; x++) rampdata[x][y] = tempmap[3 * 40 + x][y + 40]; - for(int y = 0; y <= 23; y++) - for(int x = 0; x <= 39; x++) - for(int l = 0; l <= 2; l++) - for(int a = 0; a <= 2; a++) + for (int y = 0; y <= 23; y++) + for (int x = 0; x <= 39; x++) + for (int l = 0; l <= 2; l++) + for (int a = 0; a <= 2; a++) tileinfo[l][x][y][a] = 0; - if(scriptflag[4][0] == 1 && curmap == 4) { + if (scriptflag[4][0] == 1 && curmap == 4) { triggerloc[9][7] = 5004; tempmap[9][7] = 41; tempmap[9][7 + 40] = 0; } - for(int y = 0; y <= 23; y++) { - for(int x = 0; x <= 39; x++) { - for(int l = 0; l <= 2; l++) { + for (int y = 0; y <= 23; y++) { + for (int x = 0; x <= 39; x++) { + for (int l = 0; l <= 2; l++) { int lx, ly, curtile, curtilelayer; int curtilel, curtilex, curtiley; int ffa, ffb; @@ -3744,7 +3722,7 @@ void game_loadmap(int mapnum) curtile = tempmap[lx][ly]; curtilelayer = tempmap[lx][ly + 40]; - if(curtile > 0) { + if (curtile > 0) { curtile = curtile - 1; curtilel = curtilelayer; curtilex = curtile % 20; @@ -3763,19 +3741,19 @@ void game_loadmap(int mapnum) rcDest.w = 16; rcDest.h = 16; - if(l == 2 && curtilel == 1) { - for(int ff = 0; ff <= 5; ff++) { + if (l == 2 && curtilel == 1) { + for (int ff = 0; ff <= 5; ff++) { ffa = 20 * 5 - 1 + ff * 20; ffb = 20 * 5 + 4 + ff * 20; - if(curtile > ffa && curtile < ffb) { + if (curtile > ffa && curtile < ffb) { SDL_SetAlpha(tiles[curtilel], SDL_SRCALPHA, 128); } } } - if(l == 1 && curtilel == 2) { - for(int ff = 0; ff <= 4; ff++) { + if (l == 1 && curtilel == 2) { + for (int ff = 0; ff <= 4; ff++) { ffa = 20 * (5 + ff) + 3; - if(curtile == ffa) { + if (curtile == ffa) { SDL_SetAlpha(tiles[curtilel], SDL_SRCALPHA, 192); } } @@ -3797,63 +3775,63 @@ void game_loadmap(int mapnum) } - for(int x = 0; x <= 39; x++) { - for(int y = 0; y <= 23; y++) { + for (int x = 0; x <= 39; x++) { + for (int y = 0; y <= 23; y++) { int d = tempmap[3 * 40 + x][y]; int clip = 0; int npc = 0; - if(scriptflag[4][0] == 1 && x == 9 && y == 7) d = 99; + if (scriptflag[4][0] == 1 && x == 9 && y == 7) d = 99; - if(d > 0) { + if (d > 0) { clip = d % 2; d = (d - clip) / 2; npc = d % 2; d = (d - npc) / 2; - if(d == 99 && x == 9 && y == 7) clip = 1; + if (d == 99 && x == 9 && y == 7) clip = 1; - if(clip) { - if(d != 99) d = tempmap[6 * 40 + x][y]; - if(d == 99) d = 1; + if (clip) { + if (d != 99) d = tempmap[6 * 40 + x][y]; + if (d == 99) d = 1; int x1 = x * 8; int y1 = y * 8; - if(d == 1) { - for(int i = 0; i <= 7; i++) { + if (d == 1) { + for (int i = 0; i <= 7; i++) { sys_line(clipbg, x1, y1 + i, x1 + 7 - i, y1 + i, ccc); } - } else if(d == 2) { + } else if (d == 2) { sys_line(clipbg, x1, y1, x1 + 7, y1, ccc); sys_line(clipbg, x1, y1 + 1, x1 + 7, y1 + 1, ccc); - } else if(d == 3) { - for(int i = 0; i <= 7; i++) { + } else if (d == 3) { + for (int i = 0; i <= 7; i++) { sys_line(clipbg, x1 + i, y1 + i, x1 + 7, y1 + i, ccc); } - } else if(d == 4) { + } else if (d == 4) { sys_line(clipbg, x1, y1, x1, y1 + 7, ccc); sys_line(clipbg, x1 + 1, y1, x1 + 1, y1 + 7, ccc); - } else if(d == 5) { + } else if (d == 5) { rcDest.x = x1; rcDest.y = y1; rcDest.w = 8; rcDest.h = 8; - SDL_FillRect(clipbg, &rcDest, SDL_MapRGB(clipbg->format, 255,255,255)); - } else if(d == 6) { + SDL_FillRect(clipbg, &rcDest, SDL_MapRGB(clipbg->format, 255, 255, 255)); + } else if (d == 6) { sys_line(clipbg, x1 + 7, y1, x1 + 7, y1 + 7, ccc); sys_line(clipbg, x1 + 6, y1, x1 + 6, y1 + 7, ccc); - } else if(d == 7) { - for(int i = 0; i <= 7; i++) { + } else if (d == 7) { + for (int i = 0; i <= 7; i++) { sys_line(clipbg, x1, y1 + i, x1 + i, y1 + i, ccc); } - } else if(d == 8) { + } else if (d == 8) { sys_line(clipbg, x1, y1 + 7, x1 + 7, y1 + 7, ccc); sys_line(clipbg, x1, y1 + 7, x1 + 6, y1 + 6, ccc); - } else if(d == 9) { - for(int i = 0; i <= 7; i++) { + } else if (d == 9) { + for (int i = 0; i <= 7; i++) { sys_line(clipbg, x1 + 7 - i, y1 + i, x1 + 7, y1 + i, ccc); } } @@ -3865,17 +3843,17 @@ void game_loadmap(int mapnum) lastobj = 0; lastnpc = 0; - for(int i = 0; i < MAXNPC; i++) + for (int i = 0; i < MAXNPC; i++) npcinfo[i].onmap = 0; - for(int x = 0; x <= 19; x++) { - for(int y = 0; y <= 19; y++) { + for (int x = 0; x <= 19; x++) { + for (int y = 0; y <= 19; y++) { int d = tempmap[3 * 40 + x][y]; int clip = 0; int npc = 0; int obj = 0; - if(d > 0) { + if (d > 0) { clip = d % 2; d = (d - clip) / 2; npc = d % 2; @@ -3885,15 +3863,15 @@ void game_loadmap(int mapnum) objmap[x][y] = -1; - if(obj == 1) { + if (obj == 1) { int o = tempmap[5 * 40 + x][y]; - if(objmapf[curmap][x][y] == 0) { + if (objmapf[curmap][x][y] == 0) { objmap[x][y] = o; - if(objectinfo[o][0] > 1) { - if(o > lastobj) lastobj = o; + if (objectinfo[o][0] > 1) { + if (o > lastobj) lastobj = o; } int x1 = x * 8; @@ -3904,14 +3882,14 @@ void game_loadmap(int mapnum) rcDest.w = 8; rcDest.h = 8; - if(objectinfo[o][4] == 1) SDL_FillRect(clipbg, &rcDest, SDL_MapRGB(clipbg->format, 255,255,255)); - if(objectinfo[o][4] == 3) SDL_FillRect(clipbg, &rcDest, SDL_MapRGB(clipbg->format, 255,255,255)); + if (objectinfo[o][4] == 1) SDL_FillRect(clipbg, &rcDest, SDL_MapRGB(clipbg->format, 255, 255, 255)); + if (objectinfo[o][4] == 3) SDL_FillRect(clipbg, &rcDest, SDL_MapRGB(clipbg->format, 255, 255, 255)); } } - if(npc == 1) { + if (npc == 1) { int o = tempmap[4 * 40 + x][y]; - if(o > lastnpc) lastnpc = o; + if (o > lastnpc) lastnpc = o; npcinfo[o].x = x * 16 - 4; npcinfo[o].y = y * 16 - 5; @@ -3923,20 +3901,21 @@ void game_loadmap(int mapnum) } - if(curmap == 62 && scriptflag[8][0] > 0) lastnpc = 0; - if(curmap == 73 && scriptflag[12][0] > 0) lastnpc = 0; - if(curmap == 81 && scriptflag[13][0] > 0) lastnpc = 0; + if (curmap == 62 && scriptflag[8][0] > 0) lastnpc = 0; + if (curmap == 73 && scriptflag[12][0] > 0) lastnpc = 0; + if (curmap == 81 && scriptflag[13][0] > 0) lastnpc = 0; - if(curmap == 73 && scriptflag[12][0] == 0) roomlock = 1; - if(curmap == 81 && scriptflag[13][0] == 0) roomlock = 1; - if(curmap == 83 && scriptflag[15][0] == 0) roomlock = 1; - if(curmap == 82) roomlock = 1; + if (curmap == 73 && scriptflag[12][0] == 0) roomlock = 1; + if (curmap == 81 && scriptflag[13][0] == 0) roomlock = 1; + if (curmap == 83 && scriptflag[15][0] == 0) roomlock = 1; + if (curmap == 82) roomlock = 1; // read *.npc file - sprintf(name, "mapdb/%04i.npc", mapnum); printf("Reading %s\n", name); + sprintf(name, "mapdb/%04i.npc", mapnum); + printf("Reading %s\n", name); fp = fopen(name, "r"); - for(int i = 0; i < MAXNPC; i++) { + for (int i = 0; i < MAXNPC; i++) { INPUT("%i", &npcinfo[i].spriteset); INPUT("%i", &npcinfo[i].x1); INPUT("%i", &npcinfo[i].y1); @@ -3950,7 +3929,7 @@ void game_loadmap(int mapnum) INPUT("%i", &npcinfo[i].script); // baby dragon - if(npcinfo[i].spriteset == 1) { + if (npcinfo[i].spriteset == 1) { npcinfo[i].hp = 12; npcinfo[i].attackdelay = 2000; @@ -3959,11 +3938,11 @@ void game_loadmap(int mapnum) npcinfo[i].walkspd = 1; - if(RND() * 5 == 0) npcinfo[i].hp = 0; + if (RND() * 5 == 0) npcinfo[i].hp = 0; } // onewing - if(npcinfo[i].spriteset == 2) { + if (npcinfo[i].spriteset == 2) { npcinfo[i].hp = 200; npcinfo[i].attackdelay = 2000; npcinfo[i].swayspd = 1; @@ -3976,7 +3955,7 @@ void game_loadmap(int mapnum) } // boss1 - if(npcinfo[i].spriteset == 3) { + if (npcinfo[i].spriteset == 3) { npcinfo[i].hp = 300; npcinfo[i].attackdelay = 2200; @@ -3987,7 +3966,7 @@ void game_loadmap(int mapnum) } // black knights - if(npcinfo[i].spriteset == 4) { + if (npcinfo[i].spriteset == 4) { npcinfo[i].hp = 200; npcinfo[i].attackdelay = 2800; @@ -3998,7 +3977,7 @@ void game_loadmap(int mapnum) } // boss2 firehydra - if(npcinfo[i].spriteset == 5) { + if (npcinfo[i].spriteset == 5) { npcinfo[i].hp = 600; npcinfo[i].attackdelay = 2200; @@ -4011,7 +3990,7 @@ void game_loadmap(int mapnum) } // baby fire dragon - if(npcinfo[i].spriteset == 6) { + if (npcinfo[i].spriteset == 6) { npcinfo[i].hp = 20; npcinfo[i].attackdelay = 1500; @@ -4020,11 +3999,11 @@ void game_loadmap(int mapnum) npcinfo[i].walkspd = 1; - if(RND() * 5 == 0) npcinfo[i].hp = 0; + if (RND() * 5 == 0) npcinfo[i].hp = 0; } // priest1 - if(npcinfo[i].spriteset == 7) { + if (npcinfo[i].spriteset == 7) { npcinfo[i].hp = 40; npcinfo[i].attackdelay = 5000; @@ -4033,11 +4012,11 @@ void game_loadmap(int mapnum) npcinfo[i].walkspd = 1; - if(RND() * 8 == 0) npcinfo[i].hp = 0; + if (RND() * 8 == 0) npcinfo[i].hp = 0; } // yellow fire dragon - if(npcinfo[i].spriteset == 8) { + if (npcinfo[i].spriteset == 8) { npcinfo[i].hp = 100; npcinfo[i].attackdelay = 1500; @@ -4046,11 +4025,11 @@ void game_loadmap(int mapnum) npcinfo[i].walkspd = 1; - if(RND() * 5 == 0) npcinfo[i].hp = 0; + if (RND() * 5 == 0) npcinfo[i].hp = 0; } // twowing - if(npcinfo[i].spriteset == 9) { + if (npcinfo[i].spriteset == 9) { npcinfo[i].hp = 140; npcinfo[i].attackdelay = 2000; npcinfo[i].swayspd = 1; @@ -4064,7 +4043,7 @@ void game_loadmap(int mapnum) } // dragon2 - if(npcinfo[i].spriteset == 10) { + if (npcinfo[i].spriteset == 10) { npcinfo[i].hp = 80; npcinfo[i].attackdelay = 1500; @@ -4077,7 +4056,7 @@ void game_loadmap(int mapnum) } // end boss - if(npcinfo[i].spriteset == 11) { + if (npcinfo[i].spriteset == 11) { npcinfo[i].hp = 1200; npcinfo[i].attackdelay = 2000; @@ -4090,7 +4069,7 @@ void game_loadmap(int mapnum) } // bat kitty - if(npcinfo[i].spriteset == 12) { + if (npcinfo[i].spriteset == 12) { npcinfo[i].hp = 800; npcinfo[i].attackdelay = 2000; @@ -4102,7 +4081,7 @@ void game_loadmap(int mapnum) npcinfo[i].floating = RND() * 16; } - if(npcinfo[i].onmap == 0) npcinfo[i].hp = 0; + if (npcinfo[i].onmap == 0) npcinfo[i].hp = 0; npcinfo[i].maxhp = npcinfo[i].hp; @@ -4112,7 +4091,7 @@ void game_loadmap(int mapnum) npcinfo[i].attackspd = 1.5; npcinfo[i].attacknext = ticks + npcinfo[i].attackdelay * (1 + RND() * 2); - if(npcinfo[i].spriteset == 2 || npcinfo[i].spriteset == 9) { + if (npcinfo[i].spriteset == 2 || npcinfo[i].spriteset == 9) { npcinfo[i].bodysection[0].sprite = 0; npcinfo[i].bodysection[1].sprite = 1; npcinfo[i].bodysection[2].sprite = 2; @@ -4130,7 +4109,7 @@ void game_loadmap(int mapnum) npcinfo[i].bodysection[5].bonelength = 4; npcinfo[i].bodysection[6].bonelength = 4; - for(int f = 0; f <= 7; f++) { + for (int f = 0; f <= 7; f++) { npcinfo[i].bodysection[f].x = npcinfo[i].x + 12; npcinfo[i].bodysection[f].y = npcinfo[i].y + 14; } @@ -4140,13 +4119,13 @@ void game_loadmap(int mapnum) } - if(npcinfo[i].spriteset == 5) { - for(int f = 0; f <= 29; f++) { + if (npcinfo[i].spriteset == 5) { + for (int f = 0; f <= 29; f++) { npcinfo[i].bodysection[f].x = npcinfo[i].x + 12; npcinfo[i].bodysection[f].y = npcinfo[i].y + 14; } - for(int f = 0; f <= 2; f++) { + for (int f = 0; f <= 2; f++) { npcinfo[i].headtargetx[f] = npcinfo[i].x + 12; npcinfo[i].headtargety[f] = npcinfo[i].y + 14; @@ -4155,33 +4134,33 @@ void game_loadmap(int mapnum) } } - if(npcinfo[i].script == 2) { + if (npcinfo[i].script == 2) { roomlock = 1; - if(scriptflag[2][0] > 0) { + if (scriptflag[2][0] > 0) { roomlock = 0; npcinfo[i].hp = 0; } } - if(npcinfo[i].script == 3) { + if (npcinfo[i].script == 3) { roomlock = 1; - if(scriptflag[3][0] > 0) { + if (scriptflag[3][0] > 0) { roomlock = 0; npcinfo[i].hp = 0; } } - if(npcinfo[i].script == 5) { + if (npcinfo[i].script == 5) { roomlock = 1; - if(scriptflag[5][0] > 0) { + if (scriptflag[5][0] > 0) { roomlock = 0; npcinfo[i].hp = 0; } } - if(npcinfo[i].script == 15) { + if (npcinfo[i].script == 15) { roomlock = 1; - if(scriptflag[15][0] > 0) { + if (scriptflag[15][0] > 0) { roomlock = 0; npcinfo[i].hp = 0; } @@ -4196,7 +4175,7 @@ void game_loadmap(int mapnum) int cx, cy, npx, npy, lx, ly; // academy master key - if(curmap == 34 && scriptflag[2][0] == 1) { + if (curmap == 34 && scriptflag[2][0] == 1) { cx = 9; cy = 7; @@ -4213,13 +4192,13 @@ void game_loadmap(int mapnum) lx = (int)npx / 16; ly = (int)npy / 16; - if(lx == cx && ly == cy) player.py = player.py + 16; + if (lx == cx && ly == cy) player.py = player.py + 16; - SDL_FillRect(clipbg, &rcDest, SDL_MapRGB(clipbg->format, 255,255,255)); + SDL_FillRect(clipbg, &rcDest, SDL_MapRGB(clipbg->format, 255, 255, 255)); } // academy crystal - if(curmap == 24 && player.foundspell[0] == 0 && scriptflag[3][0] == 1) { + if (curmap == 24 && player.foundspell[0] == 0 && scriptflag[3][0] == 1) { cx = 9; cy = 7; @@ -4236,13 +4215,13 @@ void game_loadmap(int mapnum) lx = (int)npx / 16; ly = (int)npy / 16; - if(lx == cx && ly == cy) player.py = player.py + 16; + if (lx == cx && ly == cy) player.py = player.py + 16; - SDL_FillRect(clipbg, &rcDest, SDL_MapRGB(clipbg->format, 255,255,255)); + SDL_FillRect(clipbg, &rcDest, SDL_MapRGB(clipbg->format, 255, 255, 255)); } // gardens master key - if(curmap == 62 && scriptflag[8][0] == 1) { + if (curmap == 62 && scriptflag[8][0] == 1) { cx = 13; cy = 7; @@ -4259,13 +4238,13 @@ void game_loadmap(int mapnum) lx = (int)npx / 16; ly = (int)npy / 16; - if(lx == cx && ly == cy) player.py = player.py + 16; + if (lx == cx && ly == cy) player.py = player.py + 16; - SDL_FillRect(clipbg, &rcDest, SDL_MapRGB(clipbg->format, 255,255,255)); + SDL_FillRect(clipbg, &rcDest, SDL_MapRGB(clipbg->format, 255, 255, 255)); } // gardens fidelis sword - if(curmap == 66 && scriptflag[5][0] == 1 && player.sword == 1) { + if (curmap == 66 && scriptflag[5][0] == 1 && player.sword == 1) { cx = 9; cy = 6; @@ -4282,13 +4261,13 @@ void game_loadmap(int mapnum) lx = (int)npx / 16; ly = (int)npy / 16; - if(lx == cx && ly == cy) player.py = player.py + 16; + if (lx == cx && ly == cy) player.py = player.py + 16; - SDL_FillRect(clipbg, &rcDest, SDL_MapRGB(clipbg->format, 255,255,255)); + SDL_FillRect(clipbg, &rcDest, SDL_MapRGB(clipbg->format, 255, 255, 255)); } // citadel armour - if(curmap == 73 && scriptflag[12][0] == 1 && player.armour == 1) { + if (curmap == 73 && scriptflag[12][0] == 1 && player.armour == 1) { cx = 8; cy = 7; @@ -4305,13 +4284,13 @@ void game_loadmap(int mapnum) lx = (int)npx / 16; ly = (int)npy / 16; - if(lx == cx && ly == cy) player.py = player.py + 16; + if (lx == cx && ly == cy) player.py = player.py + 16; - SDL_FillRect(clipbg, &rcDest, SDL_MapRGB(clipbg->format, 255,255,255)); + SDL_FillRect(clipbg, &rcDest, SDL_MapRGB(clipbg->format, 255, 255, 255)); } // citadel master key - if(curmap == 81 && scriptflag[13][0] == 1) { + if (curmap == 81 && scriptflag[13][0] == 1) { cx = 11; cy = 10; @@ -4328,14 +4307,14 @@ void game_loadmap(int mapnum) lx = (int)npx / 16; ly = (int)npy / 16; - if(lx == cx && ly == cy) player.py = player.py + 16; + if (lx == cx && ly == cy) player.py = player.py + 16; - SDL_FillRect(clipbg, &rcDest, SDL_MapRGB(clipbg->format, 255,255,255)); + SDL_FillRect(clipbg, &rcDest, SDL_MapRGB(clipbg->format, 255, 255, 255)); } // max ups - if(curmap == 83 && scriptflag[15][0] == 1 && player.sword < 3) { + if (curmap == 83 && scriptflag[15][0] == 1 && player.sword < 3) { cx = 6; cy = 8; @@ -4352,12 +4331,12 @@ void game_loadmap(int mapnum) lx = (int)npx / 16; ly = (int)npy / 16; - if(lx == cx && ly == cy) player.py = player.py + 16; + if (lx == cx && ly == cy) player.py = player.py + 16; - SDL_FillRect(clipbg, &rcDest, SDL_MapRGB(clipbg->format, 255,255,255)); + SDL_FillRect(clipbg, &rcDest, SDL_MapRGB(clipbg->format, 255, 255, 255)); } - if(curmap == 83 && scriptflag[16][0] == 1 && player.shield < 3) { + if (curmap == 83 && scriptflag[16][0] == 1 && player.shield < 3) { cx = 9; cy = 8; @@ -4374,12 +4353,12 @@ void game_loadmap(int mapnum) lx = (int)npx / 16; ly = (int)npy / 16; - if(lx == cx && ly == cy) player.py = player.py + 16; + if (lx == cx && ly == cy) player.py = player.py + 16; - SDL_FillRect(clipbg, &rcDest, SDL_MapRGB(clipbg->format, 255,255,255)); + SDL_FillRect(clipbg, &rcDest, SDL_MapRGB(clipbg->format, 255, 255, 255)); } - if(curmap == 83 && scriptflag[17][0] == 1 && player.armour < 3) { + if (curmap == 83 && scriptflag[17][0] == 1 && player.armour < 3) { cx = 12; cy = 8; @@ -4396,22 +4375,20 @@ void game_loadmap(int mapnum) lx = (int)npx / 16; ly = (int)npy / 16; - if(lx == cx && ly == cy) player.py = player.py + 16; + if (lx == cx && ly == cy) player.py = player.py + 16; - SDL_FillRect(clipbg, &rcDest, SDL_MapRGB(clipbg->format, 255,255,255)); - } + SDL_FillRect(clipbg, &rcDest, SDL_MapRGB(clipbg->format, 255, 255, 255)); + } SDL_BlitSurface(clipbg, NULL, clipbg2, NULL); } -void game_main() -{ +void game_main() { game_title(0); game_saveloadnew(); } -void game_newgame() -{ +void game_newgame() { float xofs = 0; float ld = 0, add; int ticks, cnt = 0; @@ -4427,7 +4404,7 @@ void game_newgame() fpsr = 0.0; int y = 140; - if(menabled == 1 && config.music == 1) { + if (menabled == 1 && config.music == 1) { Mix_HaltChannel(-1); musicchannel = Mix_PlayChannel(-1, mendofgame, -1); Mix_Volume(musicchannel, 0); @@ -4442,37 +4419,37 @@ void game_newgame() SDL_Rect rc; ld += 4 * fpsr; - if((int)ld > config.musicvol) ld = config.musicvol; - if(menabled == 1 && ldstop == 0) { + if ((int)ld > config.musicvol) ld = config.musicvol; + if (menabled == 1 && ldstop == 0) { Mix_Volume(musicchannel, (int)ld); - if((int)ld == config.musicvol) ldstop = 1; + if ((int)ld == config.musicvol) ldstop = 1; } - rc.x = -xofs; + rc.x = -xofs; rc.y = 0; SDL_BlitSurface(titleimg, NULL, videobuffer, &rc); - rc.x = -xofs + 320; + rc.x = -xofs + 320; rc.y = 0; SDL_BlitSurface(titleimg, NULL, videobuffer, &rc); - if(++cnt >= 6) { + if (++cnt >= 6) { cnt = 0; y--; } - for(int i = 0; i <= 37; i++) { + for (int i = 0; i <= 37; i++) { int yy, x; yy = y + i * 10; - if(yy > -8 && yy < 240) { + if (yy > -8 && yy < 240) { x = 160 - strlen(story[i]) * 4; sys_print(videobuffer, story[i], x, yy, 4); } - if(yy < 10 && i == 47) goto __exit_do; + if (yy < 10 && i == 47) goto __exit_do; } SDL_BLITVIDEO(videobuffer, NULL, video, NULL); @@ -4485,25 +4462,25 @@ void game_newgame() fpsr = (float)tickspassed / 24.0; fp++; - if(ticks > nextticks) { + if (ticks > nextticks) { nextticks = ticks + 1000; fps = fp; fp = 0; } add = 0.5 * fpsr; - if(add > 1) add = 1; + if (add > 1) add = 1; xofs += add; - if(xofs >= 320) xofs = xofs - 320; + if (xofs >= 320) xofs = xofs - 320; SDL_PollEvent(&event); keys = SDL_GetKeyState(NULL); - if(event.type == SDL_KEYDOWN) cnt = 6; - if(keys[SDLK_ESCAPE] || keys[SDLK_LALT]) goto __exit_do; + if (event.type == SDL_KEYDOWN) cnt = 6; + if (keys[SDLK_ESCAPE] || keys[SDLK_LALT]) goto __exit_do; SDL_Delay(10); - } while(1); + } while (1); __exit_do: player.px = 0; @@ -4523,7 +4500,7 @@ __exit_do: player.sword = 0; player.shield = 0; player.armour = 0; - for(int i = 0; i < 5; i++) { + for (int i = 0; i < 5; i++) { player.foundspell[i] = 0; player.spellcharge[i] = 0; player.inventory[i] = 0; @@ -4563,8 +4540,8 @@ __exit_do: player.sworddamage = player.level * 2; player.spelldamage = player.level * 3 / 2; - player.px = 15*16 - 4; - player.py = 6*16 - 4; + player.px = 15 * 16 - 4; + player.py = 6 * 16 - 4; player.walkdir = 1; pgardens = 0; @@ -4578,17 +4555,16 @@ __exit_do: game_playgame(); } -void game_playgame() -{ +void game_playgame() { game_swash(); - if(pmenu == 1 && menabled == 1) { + if (pmenu == 1 && menabled == 1) { Mix_HaltChannel(menuchannel); pmenu = 0; } do { - if(forcepause == 0) { + if (forcepause == 0) { game_updanims(); game_updnpcs(); } @@ -4596,7 +4572,7 @@ void game_playgame() game_checktrigger(); game_checkinputs(); - if(forcepause == 0) game_handlewalking(); + if (forcepause == 0) game_handlewalking(); game_updatey(); game_drawview(); @@ -4604,25 +4580,24 @@ void game_playgame() game_updmusic(); sys_update(); - } while(1); + } while (1); } -void game_processtrigger(int trignum) -{ +void game_processtrigger(int trignum) { int trigtype, tx, ty, tmap, tjumpstyle, tsx, tsy; trigtype = triggers[trignum][0]; - if(roomlock == 1) return; + if (roomlock == 1) return; // map jump------------------------------ - if(trigtype == 0) { + if (trigtype == 0) { tx = triggers[trignum][1]; ty = triggers[trignum][2]; tmap = triggers[trignum][3]; tjumpstyle = triggers[trignum][4]; - if(roomlocks[tmap] > 0) { - if(saidlocked == 0) game_eventtext("Locked"); + if (roomlocks[tmap] > 0) { + if (saidlocked == 0) game_eventtext("Locked"); saidlocked = 1; canusekey = 1; locktype = roomlocks[tmap]; @@ -4630,8 +4605,8 @@ void game_processtrigger(int trignum) return; } - if(tmap == 1) { - if(saidjammed == 0) game_eventtext("Door Jammed!"); + if (tmap == 1) { + if (saidjammed == 0) game_eventtext("Door Jammed!"); saidjammed = 1; return; } @@ -4640,7 +4615,7 @@ void game_processtrigger(int trignum) saidjammed = 0; // loc-sxy+oldmaploc - if(tjumpstyle == 0) { + if (tjumpstyle == 0) { tsx = triggers[trignum][5]; tsy = triggers[trignum][6]; @@ -4649,11 +4624,11 @@ void game_processtrigger(int trignum) player.py += (ty - tsy) * 16; // HACKFIX - if(player.px < 0) player.px = 0; - if(player.py < 0) player.py = 0; + if (player.px < 0) player.px = 0; + if (player.py < 0) player.py = 0; - if(tmap > 0) { - if(menabled == 1 && config.effects == 1) { + if (tmap > 0) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[snddoor], 0); Mix_Volume(snd, config.effectsvol); } @@ -4664,15 +4639,15 @@ void game_processtrigger(int trignum) } } - for(int i = 0; i < MAXFLOAT; i++) { + for (int i = 0; i < MAXFLOAT; i++) { floattext[i][0] = 0; floaticon[i][0] = 0; } } -void game_saveloadnew() -{ - float y; int yy; +void game_saveloadnew() { + float y; + int yy; int currow, curcol, lowerlock; int ticks, ticks1, tickpause; @@ -4719,40 +4694,40 @@ void game_saveloadnew() SDL_PollEvent(&event); keys = SDL_GetKeyState(NULL); - if(tickpause < ticks) { - if(event.type == SDL_KEYDOWN) { + if (tickpause < ticks) { + if (event.type == SDL_KEYDOWN) { itemticks = ticks + 220; - if(keys[SDLK_LCTRL] || keys[SDLK_RETURN]) { + if (keys[SDLK_LCTRL] || keys[SDLK_RETURN]) { // QUIT - non existent :) - if(currow == 0 && curcol == 4) { + if (currow == 0 && curcol == 4) { exit(1); } // RETURN - if(currow == 0 && curcol == 3) { + if (currow == 0 && curcol == 3) { // reset keys to avoid returning keys[SDLK_RETURN] = keys[SDLK_SPACE] = 0; return; } // NEW GAME - if(currow == 0 && curcol == 0) game_newgame(); + if (currow == 0 && curcol == 0) game_newgame(); // LOAD GAME - if(currow == 0 && curcol == 1) { + if (currow == 0 && curcol == 1) { lowerlock = 1; currow = 1 + saveslot; tickpause = ticks + 125; } // SAVE GAME - if(currow == 0 && curcol == 2) { + if (currow == 0 && curcol == 2) { lowerlock = 1; currow = 1; tickpause = ticks + 125; } - if(lowerlock == 1 && curcol == 1 && tickpause < ticks) { - if(state_save(currow - 1)) { + if (lowerlock == 1 && curcol == 1 && tickpause < ticks) { + if (state_save(currow - 1)) { secstart = secstart + secsingame; secsingame = 0; lowerlock = 0; @@ -4761,8 +4736,8 @@ void game_saveloadnew() } } - if(lowerlock == 1 && curcol == 2 && tickpause < ticks) { - if(state_load(currow - 1)) { + if (lowerlock == 1 && curcol == 2 && tickpause < ticks) { + if (state_load(currow - 1)) { player.walkspd = 1.1; animspd = .5; attacking = 0; @@ -4786,42 +4761,42 @@ void game_saveloadnew() tickpause = ticks + 125; } - switch(event.key.keysym.sym) { + switch (event.key.keysym.sym) { case SDLK_ESCAPE: case SDLK_LALT: - if(lowerlock == 0) return; + if (lowerlock == 0) return; lowerlock = 0; currow = 0; tickpause = ticks + 125; break; case SDLK_DOWN: - if(lowerlock == 1) { + if (lowerlock == 1) { currow = currow + 1; - if(currow == 5) currow = 1; + if (currow == 5) currow = 1; tickpause = ticks + 125; } break; case SDLK_UP: - if(lowerlock == 1) { + if (lowerlock == 1) { currow = currow - 1; - if(currow == 0) currow = 4; + if (currow == 0) currow = 4; tickpause = ticks + 125; } break; case SDLK_LEFT: - if(lowerlock == 0) { + if (lowerlock == 0) { curcol = curcol - 1; - if(curcol == -1) curcol = 3; + if (curcol == -1) curcol = 3; tickpause = ticks + 125; } break; case SDLK_RIGHT: - if(lowerlock == 0) { + if (lowerlock == 0) { curcol = curcol + 1; - if(curcol == 4) curcol = 0; + if (curcol == 4) curcol = 0; tickpause = ticks + 125; } break; @@ -4835,10 +4810,10 @@ void game_saveloadnew() // savestates--------------------------------- // read it only when needed! - for(int ff = 0; ff <= 3; ff++) { + for (int ff = 0; ff <= 3; ff++) { state_load_player(ff); - if(playera.level > 0) { + if (playera.level > 0) { char line[256]; int sx, sy, cc, ss, nx; @@ -4862,7 +4837,7 @@ void game_saveloadnew() sprintf(line, "Health: %i/%i", playera.hp, playera.maxhp); sys_print(videobuffer, line, sx, sy, cc); - if(playera.level == 22) + if (playera.level == 22) strcpy(line, "Level: MAX"); else sprintf(line, "Level: %i", playera.level); @@ -4873,26 +4848,26 @@ void game_saveloadnew() rcSrc.y = sy + 1; ss = (playera.sword - 1) * 3; - if(playera.sword == 3) ss = 18; + if (playera.sword == 3) ss = 18; SDL_BlitSurface(itemimg[ss], NULL, videobuffer, &rcSrc); rcSrc.x = rcSrc.x + 16; ss = (playera.shield - 1) * 3 + 1; - if(playera.shield == 3) ss = 19; + if (playera.shield == 3) ss = 19; SDL_BlitSurface(itemimg[ss], NULL, videobuffer, &rcSrc); rcSrc.x = rcSrc.x + 16; ss = (playera.armour - 1) * 3 + 2; - if(playera.armour == 3) ss = 20; + if (playera.armour == 3) ss = 20; SDL_BlitSurface(itemimg[ss], NULL, videobuffer, &rcSrc); nx = rcSrc.x + 13 + 3 * 8; rcSrc.x = nx - 17; - if(playera.foundspell[0] == 1) { - for(int i = 0; i < 5; i++) { + if (playera.foundspell[0] == 1) { + for (int i = 0; i < 5; i++) { rcSrc.x = rcSrc.x + 17; - if(playera.foundspell[i] == 1) SDL_BlitSurface(itemimg[7 + i], NULL, videobuffer, &rcSrc); + if (playera.foundspell[i] == 1) SDL_BlitSurface(itemimg[7 + i], NULL, videobuffer, &rcSrc); } } } else { @@ -4903,16 +4878,16 @@ void game_saveloadnew() // ------------------------------------------ - if(currow == 0) { + if (currow == 0) { rcDest.y = 18; - if(curcol == 0) rcDest.x = 10; - if(curcol == 1) rcDest.x = 108; - if(curcol == 2) rcDest.x = 170; - if(curcol == 3) rcDest.x = 230; + if (curcol == 0) rcDest.x = 10; + if (curcol == 1) rcDest.x = 108; + if (curcol == 2) rcDest.x = 170; + if (curcol == 3) rcDest.x = 230; rcDest.x = (float)(rcDest.x + 2 + 2 * sin(3.14159 * 2 * itemyloc / 16)); } - if(currow > 0) { + if (currow > 0) { rcDest.x = (float)(0 + 2 * sin(3.14159 * 2 * itemyloc / 16)); rcDest.y = (float)(53 + (currow - 1) * 48); } @@ -4920,20 +4895,20 @@ void game_saveloadnew() SDL_BlitSurface(itemimg[15], NULL, videobuffer, &rcDest); - if(lowerlock == 1) { + if (lowerlock == 1) { rcDest.y = 18; - if(curcol == 1) rcDest.x = 108; - if(curcol == 2) rcDest.x = 170; + if (curcol == 1) rcDest.x = 108; + if (curcol == 2) rcDest.x = 170; rcDest.x = rcDest.x; // + 2 + 2 * sin(-3.14159 * 2 * itemyloc / 16) SDL_BlitSurface(itemimg[15], NULL, videobuffer, &rcDest); } yy = 255; - if(ticks < ticks1 + 1000) { + if (ticks < ticks1 + 1000) { yy = 255 * (ticks - ticks1) / 1000; - if(yy < 0) yy = 0; - if(yy > 255) yy = 255; + if (yy < 0) yy = 0; + if (yy > 255) yy = 255; } SDL_SetAlpha(videobuffer, SDL_SRCALPHA, (int)yy); @@ -4950,26 +4925,25 @@ void game_saveloadnew() fpsr = (float)tickspassed / 24; fp++; - if(ticks > nextticks) { + if (ticks > nextticks) { nextticks = ticks + 1000; fps = fp; fp = 0; } clouddeg += 0.01 * fpsr; - while(clouddeg >= 360) clouddeg -= 360; + while (clouddeg >= 360) clouddeg -= 360; itemyloc += 0.6 * fpsr; - while(itemyloc >= 16) itemyloc -= 16; + while (itemyloc >= 16) itemyloc -= 16; SDL_Delay(10); - } while(1); + } while (1); SDL_SetAlpha(cloudimg, SDL_SRCALPHA, 64); } -void game_showlogos() -{ +void game_showlogos() { float y; int ticks1; @@ -4980,16 +4954,16 @@ void game_showlogos() do { y = 255.0; - if(ticks < ticks1 + 1000) { + if (ticks < ticks1 + 1000) { y = 255.0 * ((float)(ticks - ticks1) / 1000.0); - if(y < 0.0) y = 0.0; - if(y > 255.0) y = 255.0; + if (y < 0.0) y = 0.0; + if (y > 255.0) y = 255.0; } - if(ticks > ticks1 + 3000) { + if (ticks > ticks1 + 3000) { y = 255.0 - 255.0 * ((float)(ticks - ticks1 - 3000.0) / 1000.0); - if(y < 0.0) y = 0.0; - if(y > 255.0) y = 255.0; + if (y < 0.0) y = 0.0; + if (y > 255.0) y = 255.0; } SDL_FillRect(videobuffer, NULL, 0); @@ -5010,20 +4984,19 @@ void game_showlogos() fpsr = (float)tickspassed / 24; fp++; - if(ticks > nextticks) { + if (ticks > nextticks) { nextticks = ticks + 1000; fps = fp; fp = 0; } SDL_Delay(10); - if(ticks > ticks1 + 4000) break; - } while(1); + if (ticks > ticks1 + 4000) break; + } while (1); } -void game_swash() -{ +void game_swash() { float y; y = 0; @@ -5045,17 +5018,17 @@ void game_swash() fpsr = (float)tickspassed / 24.0; fp++; - if(ticks > nextticks) { + if (ticks > nextticks) { nextticks = ticks + 1000; fps = fp; fp = 0; } clouddeg += 0.01 * fpsr; - while(clouddeg >= 360) clouddeg = clouddeg - 360; + while (clouddeg >= 360) clouddeg = clouddeg - 360; - if(y > 10) break; - } while(1); + if (y > 10) break; + } while (1); y = 0; do { @@ -5064,7 +5037,7 @@ void game_swash() SDL_SetAlpha(videobuffer, SDL_SRCALPHA, (int)(y * 25)); SDL_BlitSurface(mapbg, NULL, videobuffer, NULL); - if(cloudson == 1) { + if (cloudson == 1) { rcDest.x = (float)(256 + 256 * cos(3.141592 / 180 * clouddeg)); rcDest.y = (float)(192 + 192 * sin(3.141592 / 180 * clouddeg)); rcDest.w = 320; @@ -5084,30 +5057,29 @@ void game_swash() fpsr = (float)tickspassed / 24.0; fp++; - if(ticks > nextticks) { + if (ticks > nextticks) { nextticks = ticks + 1000; fps = fp; fp = 0; } clouddeg += 0.01 * fpsr; - while(clouddeg >= 360) clouddeg = clouddeg - 360; + while (clouddeg >= 360) clouddeg = clouddeg - 360; - if(y > 10) break; - } while(1); + if (y > 10) break; + } while (1); SDL_SetAlpha(videobuffer, SDL_SRCALPHA, 255); } -void game_theend() -{ - for(int i = 0; i < MAXFLOAT; i++) { +void game_theend() { + for (int i = 0; i < MAXFLOAT; i++) { floattext[i][0] = 0; floaticon[i][0] = 0; } - for(float y = 0; y < 100; y += fpsr) { + for (float y = 0; y < 100; y += fpsr) { SDL_SetAlpha(videobuffer, SDL_SRCALPHA, (int)y); SDL_FillRect(videobuffer, NULL, 0); SDL_BLITVIDEO(videobuffer, NULL, video, NULL); @@ -5122,7 +5094,7 @@ void game_theend() fpsr = (float)tickspassed / 24.0; fp++; - if(ticks > nextticks) { + if (ticks > nextticks) { nextticks = ticks + 1000; fps = fp; fp = 0; @@ -5132,8 +5104,7 @@ void game_theend() game_title(0); } -void game_title(int mode) -{ +void game_title(int mode) { float xofs = 0; int ticks, ticks1, keypause; int cursel, ldstop; @@ -5158,7 +5129,7 @@ void game_title(int mode) ticks1 = ticks; - if(menabled == 1 && config.music == 1) { + if (menabled == 1 && config.music == 1) { Mix_Volume(musicchannel, 0); Mix_Pause(musicchannel); @@ -5174,10 +5145,10 @@ void game_title(int mode) SDL_Rect rc; ld += 4.0 * fpsr; - if(ld > config.musicvol) ld = config.musicvol; - if(menabled == 1 && ldstop == 0) { + if (ld > config.musicvol) ld = config.musicvol; + if (menabled == 1 && ldstop == 0) { Mix_Volume(menuchannel, (int)ld); - if((int)ld == config.musicvol) ldstop = 1; + if ((int)ld == config.musicvol) ldstop = 1; } rc.x = -xofs; @@ -5202,8 +5173,8 @@ void game_title(int mode) sys_print(videobuffer, "options", x, y + 16, 4); sys_print(videobuffer, "quit game", x, y + 32, 4); - if(mode == 1) sys_print(videobuffer, "return", x, y + 48, 4); - else sys_print(videobuffer, "(c) 2005 by Daniel 'Syn9' Kennedy", 28, 224, 4); + if (mode == 1) sys_print(videobuffer, "return", x, y + 48, 4); + else sys_print(videobuffer, "(c) 2005 by Daniel 'Syn9' Kennedy", 28, 224, 4); rc.x = (float)(x - 16 - 4 * cos(3.14159 * 2 * itemyloc / 16)); rc.y = (float)(y - 4 + 16 * cursel); @@ -5211,10 +5182,10 @@ void game_title(int mode) SDL_BlitSurface(itemimg[15], NULL, videobuffer, &rc); float yf = 255.0; - if(ticks < ticks1 + 1000) { + if (ticks < ticks1 + 1000) { yf = 255.0 * ((float)(ticks - ticks1) / 1000.0); - if(y < 0.0) yf = 0.0; - if(y > 255.0) yf = 255.0; + if (y < 0.0) yf = 0.0; + if (y > 255.0) yf = 255.0; } SDL_SetAlpha(videobuffer, SDL_SRCALPHA, (int)yf); @@ -5228,63 +5199,63 @@ void game_title(int mode) fpsr = (float)tickspassed / 24.0; fp++; - if(ticks > nextticks) { + if (ticks > nextticks) { nextticks = ticks + 1000; fps = fp; fp = 0; } float add = 0.5 * fpsr; - if(add > 1) add = 1; + if (add > 1) add = 1; xofs = xofs + add; - if(xofs >= 320.0) xofs -= 320.0; + if (xofs >= 320.0) xofs -= 320.0; itemyloc += 0.75 * fpsr; - while(itemyloc >= 16) + while (itemyloc >= 16) itemyloc = itemyloc - 16; SDL_PollEvent(&event); - if(keypause < ticks) { + if (keypause < ticks) { keys = SDL_GetKeyState(NULL); - if(event.type == SDL_KEYDOWN) { + if (event.type == SDL_KEYDOWN) { keypause = ticks + 150; - if((keys[SDLK_ESCAPE] || keys[SDLK_LALT]) && mode == 1) break; - else if(keys[SDLK_UP]) { + if ((keys[SDLK_ESCAPE] || keys[SDLK_LALT]) && mode == 1) break; + else if (keys[SDLK_UP]) { cursel--; - if(cursel < 0) cursel = (mode == 1 ? 3 : 2); - } else if(keys[SDLK_DOWN]) { + if (cursel < 0) cursel = (mode == 1 ? 3 : 2); + } else if (keys[SDLK_DOWN]) { cursel++; - if(cursel >= (mode == 1 ? 4 : 3)) cursel = 0; - } else if(keys[SDLK_LCTRL] || keys[SDLK_RETURN]) { - if(cursel == 0) { + if (cursel >= (mode == 1 ? 4 : 3)) cursel = 0; + } else if (keys[SDLK_LCTRL] || keys[SDLK_RETURN]) { + if (cursel == 0) { game_saveloadnew(); ticks = SDL_GetTicks(); keypause = ticks + 150; ticks1 = ticks; - } else if(cursel == 1) { + } else if (cursel == 1) { game_configmenu(); ticks = SDL_GetTicks(); keypause = ticks + 150; ticks1 = ticks; - } else if(cursel == 2) { + } else if (cursel == 2) { exit(1); - } else if(cursel == 3) break; + } else if (cursel == 3) break; } } } SDL_Flip(video); SDL_Delay(10); - } while(1); + } while (1); itemticks = ticks + 210; - if(menabled == 1 && config.music == 1) { + if (menabled == 1 && config.music == 1) { Mix_HaltChannel(menuchannel); Mix_Resume(musicchannel); Mix_Volume(musicchannel, config.musicvol); @@ -5292,23 +5263,22 @@ void game_title(int mode) } } -void game_updanims() -{ - for(int i = 0; i <= lastobj; i++) { +void game_updanims() { + for (int i = 0; i <= lastobj; i++) { int nframes = objectinfo[i][0]; int oanimspd = objectinfo[i][3]; float frame = objectframe[i][0]; int cframe = objectframe[i][1]; // objectinfo[i][6] = 0; // ?? out of bounds - if(nframes > 1) { + if (nframes > 1) { frame = frame + oanimspd / 50 * fpsr; - while(frame >= nframes) + while (frame >= nframes) frame = frame - nframes; cframe = (int)frame; // truncate fractional part - if(cframe > nframes) cframe = nframes - 1; - if(cframe < 0) cframe = 0; + if (cframe > nframes) cframe = nframes - 1; + if (cframe < 0) cframe = 0; objectframe[i][0] = frame; objectframe[i][1] = cframe; @@ -5316,50 +5286,48 @@ void game_updanims() } } -void game_updatey() -{ +void game_updatey() { int yy, ff; - for(int i = 0; i <= 2400; i++) + for (int i = 0; i <= 2400; i++) ysort[i] = -1; ff = (int)(player.py * 10); - if(ff < 0) ff = 0; // HACKFIX or ysort[yy] may go out of bounds + if (ff < 0) ff = 0; // HACKFIX or ysort[yy] may go out of bounds player.ysort = ff; ysort[ff] = 0; firsty = 2400; lasty = 0; - for(int i = 1; i <= lastnpc; i++) { + for (int i = 1; i <= lastnpc; i++) { yy = (int)(npcinfo[i].y * 10); do { - if(ysort[yy] == -1 || yy == 2400) break; + if (ysort[yy] == -1 || yy == 2400) break; yy = yy + 1; - } while(1); + } while (1); ysort[yy] = i; - if(yy < firsty) firsty = yy; - if(yy > lasty) lasty = yy; + if (yy < firsty) firsty = yy; + if (yy > lasty) lasty = yy; } } -void game_updmusic() -{ +void game_updmusic() { Mix_Chunk *iplaysound = NULL; - if(menabled == 1 && config.music == 1) { + if (menabled == 1 && config.music == 1) { // if(curmap > 5 && curmap < 42) iplaysound = macademy; // if(curmap > 47) iplaysound = mgardens; iplaysound = mgardens; - if(roomlock == 1) iplaysound = mboss; + if (roomlock == 1) iplaysound = mboss; - if(iplaysound == mboss && pboss) iplaysound = NULL; - if(iplaysound == mgardens && pgardens) iplaysound = NULL; + if (iplaysound == mboss && pboss) iplaysound = NULL; + if (iplaysound == mgardens && pgardens) iplaysound = NULL; - if(iplaysound != NULL) { + if (iplaysound != NULL) { Mix_HaltChannel(musicchannel); pboss = 0; @@ -5368,22 +5336,22 @@ void game_updmusic() pacademy = 0; pcitadel = 0; - if(iplaysound == mboss) pboss = 1; - if(iplaysound == mgardens) pgardens = 1; + if (iplaysound == mboss) pboss = 1; + if (iplaysound == mgardens) pgardens = 1; musicchannel = Mix_PlayChannel(-1, iplaysound, -1); Mix_Volume(musicchannel, config.musicvol); } else { - if(!Mix_Playing(musicchannel)) { + if (!Mix_Playing(musicchannel)) { loopseta = loopseta + 1; - if(loopseta == 4) loopseta = 0; + if (loopseta == 4) loopseta = 0; - if(pgardens == 1) { + if (pgardens == 1) { Mix_HaltChannel(musicchannel); - if(pgardens == 1 && loopseta == 0) musicchannel = Mix_PlayChannel(-1, mgardens, 0); - if(pgardens == 1 && loopseta == 1) musicchannel = Mix_PlayChannel(-1, mgardens2, 0); - if(pgardens == 1 && loopseta == 2) musicchannel = Mix_PlayChannel(-1, mgardens3, 0); - if(pgardens == 1 && loopseta == 3) musicchannel = Mix_PlayChannel(-1, mgardens4, 0); + if (pgardens == 1 && loopseta == 0) musicchannel = Mix_PlayChannel(-1, mgardens, 0); + if (pgardens == 1 && loopseta == 1) musicchannel = Mix_PlayChannel(-1, mgardens2, 0); + if (pgardens == 1 && loopseta == 2) musicchannel = Mix_PlayChannel(-1, mgardens3, 0); + if (pgardens == 1 && loopseta == 3) musicchannel = Mix_PlayChannel(-1, mgardens4, 0); } Mix_Volume(musicchannel, config.musicvol); @@ -5392,8 +5360,7 @@ void game_updmusic() } } -void game_updnpcs() -{ +void game_updnpcs() { float npx, npy, onpx, onpy; unsigned int *temp, dq, bgc; float nnxa = 0, nnya = 0, nnxb = 0, nnyb = 0; @@ -5402,13 +5369,13 @@ void game_updnpcs() int sx, sy; int dospell = 0; - for(int i = 1; i <= lastnpc; i++) { - if(npcinfo[i].hp > 0) { + for (int i = 1; i <= lastnpc; i++) { + if (npcinfo[i].hp > 0) { // is npc walking pass = 0; - if(npcinfo[i].attacking == 0) pass = 1; - if(npcinfo[i].spriteset == 5) pass = 1; - if(pass == 1) { + if (npcinfo[i].attacking == 0) pass = 1; + if (npcinfo[i].spriteset == 5) pass = 1; + if (pass == 1) { int moveup = 0; int movedown = 0; int moveleft = 0; @@ -5422,7 +5389,7 @@ void game_updnpcs() wspd = npcinfo[i].walkspd / 4; - if(npcinfo[i].spriteset == 10) wspd = wspd * 2; + if (npcinfo[i].spriteset == 10) wspd = wspd * 2; int wdir = npcinfo[i].walkdir; int mode = npcinfo[i].movementmode; @@ -5430,15 +5397,15 @@ void game_updnpcs() xdif = player.px - npx; ydif = player.py - npy; - if(abs(xdif) < 4 * 16 && abs(ydif) < 4 * 16 && mode < 3) mode = 0; - if(npcinfo[i].hp < npcinfo[i].maxhp * 0.25) mode = 3; + if (abs(xdif) < 4 * 16 && abs(ydif) < 4 * 16 && mode < 3) mode = 0; + if (npcinfo[i].hp < npcinfo[i].maxhp * 0.25) mode = 3; - if(npcinfo[i].pause > ticks) mode = -1; - if(npcinfo[i].spriteset == 2 && npcinfo[i].castpause > ticks) mode = -1; + if (npcinfo[i].pause > ticks) mode = -1; + if (npcinfo[i].spriteset == 2 && npcinfo[i].castpause > ticks) mode = -1; - if(mode == 3) { + if (mode == 3) { mode = 1; - if(abs(xdif) < 4 * 16 && abs(ydif) < 4 * 16) mode = 3; + if (abs(xdif) < 4 * 16 && abs(ydif) < 4 * 16) mode = 3; } checkpass = 0; @@ -5447,66 +5414,66 @@ void game_updnpcs() // -------------- // *** aggressive - if(mode == 0) { + if (mode == 0) { wspd = npcinfo[i].walkspd / 2; xdif = player.px - npx; ydif = player.py - npy; - if(abs(xdif) > abs(ydif)) { - if(xdif < 4) wdir = 2; - if(xdif > -4) wdir = 3; + if (abs(xdif) > abs(ydif)) { + if (xdif < 4) wdir = 2; + if (xdif > -4) wdir = 3; } else { - if(ydif < 4) wdir = 0; - if(ydif > -4) wdir = 1; + if (ydif < 4) wdir = 0; + if (ydif > -4) wdir = 1; } - if(xdif < 4) moveleft = 1; - if(xdif > -4) moveright = 1; - if(ydif < 4) moveup = 1; - if(ydif > -4) movedown = 1; + if (xdif < 4) moveleft = 1; + if (xdif > -4) moveright = 1; + if (ydif < 4) moveup = 1; + if (ydif > -4) movedown = 1; } // ******************* // *** defensive - if(mode == 1) { + if (mode == 1) { int movingdir = npcinfo[i].movingdir; - if(npcinfo[i].ticks > ticks + 100000) npcinfo[i].ticks = ticks; + if (npcinfo[i].ticks > ticks + 100000) npcinfo[i].ticks = ticks; - if(npcinfo[i].ticks < ticks) { + if (npcinfo[i].ticks < ticks) { npcinfo[i].ticks = ticks + 2000; movingdir = (int)(RND() * 8); npcinfo[i].movingdir = movingdir; } - if(movingdir == 0) { + if (movingdir == 0) { wdir = 2; // left moveup = 1; moveleft = 1; - } else if(movingdir == 1) { + } else if (movingdir == 1) { wdir = 0; // up moveup = 1; - } else if(movingdir == 2) { + } else if (movingdir == 2) { wdir = 3; // right moveup = 1; moveright = 1; - } else if(movingdir == 3) { + } else if (movingdir == 3) { wdir = 3; // right moveright = 1; - } else if(movingdir == 4) { + } else if (movingdir == 4) { wdir = 3; // right moveright = 1; movedown = 1; - } else if(movingdir == 5) { + } else if (movingdir == 5) { wdir = 1; // down movedown = 1; - } else if(movingdir == 6) { + } else if (movingdir == 6) { wdir = 2; // left movedown = 1; moveleft = 1; - } else if(movingdir == 7) { + } else if (movingdir == 7) { wdir = 2; // left moveleft = 1; } @@ -5516,24 +5483,24 @@ void game_updnpcs() // ******************* // *** run away - if(mode == 3) { + if (mode == 3) { wspd = npcinfo[i].walkspd / 2; xdif = player.px - npx; ydif = player.py - npy; - if(abs(xdif) > abs(ydif)) { - if(xdif < 4) wdir = 3; - if(xdif > -4) wdir = 2; + if (abs(xdif) > abs(ydif)) { + if (xdif < 4) wdir = 3; + if (xdif > -4) wdir = 2; } else { - if(ydif < 4) wdir = 1; - if(ydif > -4) wdir = 0; + if (ydif < 4) wdir = 1; + if (ydif > -4) wdir = 0; } - if(xdif < 4) moveright = 1; - if(xdif > -4) moveleft = 1; - if(ydif < 4) movedown = 1; - if(ydif > -4) moveup = 1; + if (xdif < 4) moveright = 1; + if (xdif > -4) moveleft = 1; + if (ydif < 4) movedown = 1; + if (ydif > -4) moveup = 1; } // ******************* @@ -5546,147 +5513,147 @@ void game_updnpcs() float xp = (npx / 2 + 6); float yp = (npy / 2 + 10); - if(npcinfo[i].spriteset == 10) wspd = wspd * 2; + if (npcinfo[i].spriteset == 10) wspd = wspd * 2; float ii = wspd * fpsr; - if(ii < 1) ii = 1; + if (ii < 1) ii = 1; SDL_LockSurface(clipbg); - if(moveup) { + if (moveup) { sx = xp; sy = yp - ii; temp = clipbg->pixels + sy * clipbg->pitch + sx * clipbg->format->BytesPerPixel; dq = *temp; - if(npcinfo[i].spriteset == 11) dq = 0; + if (npcinfo[i].spriteset == 11) dq = 0; - if(dq == 0) movinup = 1; - if(dq > 0) { + if (dq == 0) movinup = 1; + if (dq > 0) { sx = xp - ii; sy = yp - ii; temp = clipbg->pixels + sy * clipbg->pitch + sx * clipbg->format->BytesPerPixel; dq = *temp; - if(npcinfo[i].spriteset == 11) dq = 0; - if(dq == 0) { + if (npcinfo[i].spriteset == 11) dq = 0; + if (dq == 0) { movinup = 1; movinleft = 1; } } - if(dq > 0) { + if (dq > 0) { sx = xp + ii; sy = yp - ii; temp = clipbg->pixels + sy * clipbg->pitch + sx * clipbg->format->BytesPerPixel; dq = *temp; - if(npcinfo[i].spriteset == 11) dq = 0; - if(dq == 0) { + if (npcinfo[i].spriteset == 11) dq = 0; + if (dq == 0) { movinup = 1; movinright = 1; } } } - if(movedown) { + if (movedown) { sx = xp; sy = yp + ii; temp = clipbg->pixels + sy * clipbg->pitch + sx * clipbg->format->BytesPerPixel; dq = *temp; - if(npcinfo[i].spriteset == 11) dq = 0; - if(dq == 0) movindown = 1; - if(dq > 0) { + if (npcinfo[i].spriteset == 11) dq = 0; + if (dq == 0) movindown = 1; + if (dq > 0) { sx = xp - ii; sy = yp + ii; temp = clipbg->pixels + sy * clipbg->pitch + sx * clipbg->format->BytesPerPixel; dq = *temp; - if(npcinfo[i].spriteset == 11) dq = 0; - if(dq == 0) { + if (npcinfo[i].spriteset == 11) dq = 0; + if (dq == 0) { movindown = 1; movinleft = 1; } } - if(dq > 0) { + if (dq > 0) { sx = xp + ii; sy = yp + ii; temp = clipbg->pixels + sy * clipbg->pitch + sx * clipbg->format->BytesPerPixel; dq = *temp; - if(npcinfo[i].spriteset == 11) dq = 0; - if(dq == 0 ) { + if (npcinfo[i].spriteset == 11) dq = 0; + if (dq == 0) { movindown = 1; movinright = 1; } } } - if(moveleft) { + if (moveleft) { sx = xp - ii; sy = yp; temp = clipbg->pixels + sy * clipbg->pitch + sx * clipbg->format->BytesPerPixel; dq = *temp; - if(npcinfo[i].spriteset == 11) dq = 0; - if(dq == 0) movinleft = 1; - if(dq > 0) { + if (npcinfo[i].spriteset == 11) dq = 0; + if (dq == 0) movinleft = 1; + if (dq > 0) { sx = xp - ii; sy = yp - ii; temp = clipbg->pixels + sy * clipbg->pitch + sx * clipbg->format->BytesPerPixel; dq = *temp; - if(npcinfo[i].spriteset == 11) dq = 0; - if(dq == 0) { + if (npcinfo[i].spriteset == 11) dq = 0; + if (dq == 0) { movinleft = 1; movinup = 1; } } - if(dq > 0) { + if (dq > 0) { sx = xp - ii; sy = yp + ii; temp = clipbg->pixels + sy * clipbg->pitch + sx * clipbg->format->BytesPerPixel; dq = *temp; - if(npcinfo[i].spriteset == 11) dq = 0; - if(dq == 0) { + if (npcinfo[i].spriteset == 11) dq = 0; + if (dq == 0) { movinleft = 1; movindown = 1; } } } - if(moveright) { + if (moveright) { sx = xp + ii; sy = yp; temp = clipbg->pixels + sy * clipbg->pitch + sx * clipbg->format->BytesPerPixel; dq = *temp; - if(npcinfo[i].spriteset == 11) dq = 0; - if(dq == 0) movinright = 1; - if(dq > 0) { + if (npcinfo[i].spriteset == 11) dq = 0; + if (dq == 0) movinright = 1; + if (dq > 0) { sx = xp + ii; sy = yp - ii; temp = clipbg->pixels + sy * clipbg->pitch + sx * clipbg->format->BytesPerPixel; dq = *temp; - if(npcinfo[i].spriteset == 11) dq = 0; - if(dq == 0) { + if (npcinfo[i].spriteset == 11) dq = 0; + if (dq == 0) { movinright = 1; movinup = 1; } } - if(dq > 0) { + if (dq > 0) { sx = xp + ii; sy = yp + ii; temp = clipbg->pixels + sy * clipbg->pitch + sx * clipbg->format->BytesPerPixel; dq = *temp; - if(npcinfo[i].spriteset == 11) dq = 0; - if(dq == 0) { + if (npcinfo[i].spriteset == 11) dq = 0; + if (dq == 0) { movinright = 1; movindown = 1; } } } - if(movinup) npy = npy - wspd * fpsr; - if(movindown) npy = npy + wspd * fpsr; - if(movinleft) npx = npx - wspd * fpsr; - if(movinright) npx = npx + wspd * fpsr; + if (movinup) npy = npy - wspd * fpsr; + if (movindown) npy = npy + wspd * fpsr; + if (movinleft) npx = npx - wspd * fpsr; + if (movinright) npx = npx + wspd * fpsr; - if(checkpass == 1) { + if (checkpass == 1) { pass = 0; - if(npx >= npcinfo[i].x1 * 16 - 8 && npx <= npcinfo[i].x2 * 16 + 8 && npy >= npcinfo[i].y1 * 16 - 8 && npy <= npcinfo[i].y2 * 16 + 8) pass = 1; - if(pass == 0) { + if (npx >= npcinfo[i].x1 * 16 - 8 && npx <= npcinfo[i].x2 * 16 + 8 && npy >= npcinfo[i].y1 * 16 - 8 && npy <= npcinfo[i].y2 * 16 + 8) pass = 1; + if (pass == 0) { npx = onpx; npy = onpy; npcinfo[i].ticks = ticks; @@ -5695,7 +5662,7 @@ void game_updnpcs() float aspd = wspd; - if(npcinfo[i].spriteset == 10) aspd = wspd / 2; + if (npcinfo[i].spriteset == 10) aspd = wspd / 2; xp = (npx / 2 + 6); yp = (npy / 2 + 10); @@ -5713,16 +5680,16 @@ void game_updnpcs() int lx = (int)anpx / 16; int ly = (int)anpy / 16; - if(triggerloc[lx][ly] > -1) bgc = 1; - if(npcinfo[i].spriteset == 11) bgc = 0; + if (triggerloc[lx][ly] > -1) bgc = 1; + if (npcinfo[i].spriteset == 11) bgc = 0; int rst = 0; - if(npcinfo[i].spriteset == 11) { - if(npx < 40 || npx > 280 || npy < 36 || npy > 204) rst = 1; + if (npcinfo[i].spriteset == 11) { + if (npx < 40 || npx > 280 || npy < 36 || npy > 204) rst = 1; } - if(bgc > 0 || rst == 1) { + if (bgc > 0 || rst == 1) { npx = onpx; npy = onpy; } @@ -5733,37 +5700,37 @@ void game_updnpcs() npcinfo[i].walkdir = wdir; npcinfo[i].moving = 0; - if(npx != onpx || npy != onpy) npcinfo[i].moving = 1; + if (npx != onpx || npy != onpy) npcinfo[i].moving = 1; - if(npcinfo[i].moving == 1) { + if (npcinfo[i].moving == 1) { float frame = npcinfo[i].frame; int cframe = npcinfo[i].cframe; frame = frame + aspd * fpsr; - while(frame >= 16) + while (frame >= 16) frame = frame - 16; cframe = (int)(frame); - if(cframe > 16) cframe = 16 - 1; - if(cframe < 0) cframe = 0; + if (cframe > 16) cframe = 16 - 1; + if (cframe < 0) cframe = 0; npcinfo[i].frame = frame; npcinfo[i].cframe = cframe; } // spriteset1 specific - if(npcinfo[i].spriteset == 1 && npcinfo[i].attackattempt < ticks) { - if(npcinfo[i].attacknext < ticks && npcinfo[i].pause < ticks && npcinfo[i].attacking == 0) { + if (npcinfo[i].spriteset == 1 && npcinfo[i].attackattempt < ticks) { + if (npcinfo[i].attacknext < ticks && npcinfo[i].pause < ticks && npcinfo[i].attacking == 0) { npx = npcinfo[i].x; npy = npcinfo[i].y; xdif = player.px - npx; ydif = player.py - npy; - if(abs(xdif) < 20 && abs(ydif) < 20) { + if (abs(xdif) < 20 && abs(ydif) < 20) { npcinfo[i].attackattempt = ticks + 100; - if((int)(RND() * 2) == 0) { - if(menabled == 1 && config.effects == 1) { + if ((int)(RND() * 2) == 0) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndenemyhit], 0); Mix_Volume(snd, config.effectsvol); } @@ -5776,51 +5743,51 @@ void game_updnpcs() } // onewing specific - if(npcinfo[i].spriteset == 2) { - if(npcinfo[i].attacknext < ticks && npcinfo[i].pause < ticks && npcinfo[i].attacking == 0) { - npx = npcinfo[i].x; - npy = npcinfo[i].y; + if (npcinfo[i].spriteset == 2) { + if (npcinfo[i].attacknext < ticks && npcinfo[i].pause < ticks && npcinfo[i].attacking == 0) { + npx = npcinfo[i].x; + npy = npcinfo[i].y; - xdif = player.px - npx; - ydif = player.py - npy; + xdif = player.px - npx; + ydif = player.py - npy; - if(abs(xdif) < 24 && abs(ydif) < 24) { - float dist = sqrt(xdif * xdif + ydif * ydif); + if (abs(xdif) < 24 && abs(ydif) < 24) { + float dist = sqrt(xdif * xdif + ydif * ydif); - if((dist) < 24) { - if(menabled == 1 && config.effects == 1) { - int snd = Mix_PlayChannel(-1, sfx[sndbite], 0); - Mix_Volume(snd, config.effectsvol); - } + if ((dist) < 24) { + if (menabled == 1 && config.effects == 1) { + int snd = Mix_PlayChannel(-1, sfx[sndbite], 0); + Mix_Volume(snd, config.effectsvol); + } - npcinfo[i].attacking = 1; - npcinfo[i].attackframe = 0; + npcinfo[i].attacking = 1; + npcinfo[i].attackframe = 0; - npcinfo[i].headtargetx[0] = player.px + 12; - npcinfo[i].headtargety[0] = player.py - 4; - } + npcinfo[i].headtargetx[0] = player.px + 12; + npcinfo[i].headtargety[0] = player.py - 4; } + } } dospell = 0; - if(npcinfo[i].attacking == 0 && npcinfo[i].castpause < ticks) { + if (npcinfo[i].attacking == 0 && npcinfo[i].castpause < ticks) { npcinfo[i].swayspd = npcinfo[i].swayspd + npcinfo[i].swayspd / 200 * fpsr; - if(npcinfo[i].swayspd > 15) { + if (npcinfo[i].swayspd > 15) { dospell = 1; npcinfo[i].swayspd = 1; } // sway code npcinfo[i].swayangle = npcinfo[i].swayangle + npcinfo[i].swayspd * fpsr; - if(npcinfo[i].swayangle >= 360) npcinfo[i].swayangle = npcinfo[i].swayangle - 360; + if (npcinfo[i].swayangle >= 360) npcinfo[i].swayangle = npcinfo[i].swayangle - 360; npcinfo[i].headtargetx[0] = npcinfo[i].x + (24 - npcinfo[i].swayspd / 2) * sin(3.14159 / 180 * npcinfo[i].swayangle) + 12; npcinfo[i].headtargety[0] = npcinfo[i].y - 36 + 16 + 8 * sin(3.14159 * 2 / 180 * npcinfo[i].swayangle); } - if(dospell == 1) { + if (dospell == 1) { npcinfo[i].pause = ticks + 3000; npcinfo[i].attacknext = ticks + 4500; npcinfo[i].castpause = ticks + 4500; @@ -5843,7 +5810,7 @@ void game_updnpcs() npcinfo[i].bodysection[0].x = npcinfo[i].x + 12; npcinfo[i].bodysection[0].y = npcinfo[i].y + 12; - for(int f = 6; f >= 1; f--) { + for (int f = 6; f >= 1; f--) { xdif = npcinfo[i].bodysection[f + 1].x - npcinfo[i].bodysection[f - 1].x; ydif = npcinfo[i].bodysection[f + 1].y - npcinfo[i].bodysection[f - 1].y; @@ -5856,15 +5823,15 @@ void game_updnpcs() } // boss1 specific and blackknight - if(npcinfo[i].spriteset == 3 || npcinfo[i].spriteset == 4) { - if(npcinfo[i].attacknext < ticks && npcinfo[i].pause < ticks && npcinfo[i].attacking == 0) { + if (npcinfo[i].spriteset == 3 || npcinfo[i].spriteset == 4) { + if (npcinfo[i].attacknext < ticks && npcinfo[i].pause < ticks && npcinfo[i].attacking == 0) { npcinfo[i].attacking = 1; npcinfo[i].attackframe = 0; game_castspell(1, npcinfo[i].x, npcinfo[i].y, player.px, player.py, i); } - if(npcinfo[i].castpause < ticks) { + if (npcinfo[i].castpause < ticks) { game_castspell(6, npcinfo[i].x, npcinfo[i].y, player.px, player.py, i); npcinfo[i].castpause = ticks + 12000; } @@ -5872,27 +5839,27 @@ void game_updnpcs() // firehydra specific - if(npcinfo[i].spriteset == 5) { + if (npcinfo[i].spriteset == 5) { npcinfo[i].swayspd = 4; // sway code npcinfo[i].swayangle = npcinfo[i].swayangle + npcinfo[i].swayspd * fpsr; - if(npcinfo[i].swayangle >= 360) npcinfo[i].swayangle = npcinfo[i].swayangle - 360; + if (npcinfo[i].swayangle >= 360) npcinfo[i].swayangle = npcinfo[i].swayangle - 360; - for(int ff = 0; ff <= 2; ff++) { - if(npcinfo[i].hp > 10 * ff * 20) { - if(npcinfo[i].pause < ticks && npcinfo[i].attacking2[ff] == 0 && npcinfo[i].attacknext2[ff] < ticks) { + for (int ff = 0; ff <= 2; ff++) { + if (npcinfo[i].hp > 10 * ff * 20) { + if (npcinfo[i].pause < ticks && npcinfo[i].attacking2[ff] == 0 && npcinfo[i].attacknext2[ff] < ticks) { npx = npcinfo[i].x; npy = npcinfo[i].y; xdif = player.px - npx; ydif = player.py - npy; - if(abs(xdif) < 48 && abs(ydif) < 48) { + if (abs(xdif) < 48 && abs(ydif) < 48) { float dist = sqrt(xdif * xdif + ydif * ydif); - if((dist) < 36) { - if(menabled == 1 && config.effects == 1) { + if ((dist) < 36) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndbite], 0); Mix_Volume(snd, config.effectsvol); } @@ -5910,7 +5877,7 @@ void game_updnpcs() } - if(npcinfo[i].attacking2[ff] == 0) { + if (npcinfo[i].attacking2[ff] == 0) { npcinfo[i].headtargetx[ff] = npcinfo[i].x + 38 * sin(3.14159 / 180 * (npcinfo[i].swayangle + 120 * ff)) + 12; npcinfo[i].headtargety[ff] = npcinfo[i].y - 46 + 16 + 16 * sin(3.14159 * 2 / 180 * (npcinfo[i].swayangle + 120 * ff)); } @@ -5925,7 +5892,7 @@ void game_updnpcs() npcinfo[i].bodysection[10 * ff].x = npcinfo[i].x + 12 + 8 * cos(3.141592 * 2 * (itemyloc / 16 + ff * 120 / 360)); npcinfo[i].bodysection[10 * ff].y = npcinfo[i].y + 12 + 8 * sin(3.141592 * 2 * (itemyloc / 16 + ff * 120 / 360)); - for(int f = 8; f >= 1; f--) { + for (int f = 8; f >= 1; f--) { xdif = npcinfo[i].bodysection[ff * 10 + f + 1].x - npcinfo[i].bodysection[ff * 10 + f - 1].x; ydif = npcinfo[i].bodysection[ff * 10 + f + 1].y - npcinfo[i].bodysection[ff * 10 + f - 1].y; @@ -5940,8 +5907,8 @@ void game_updnpcs() } // spriteset6 specific - if(npcinfo[i].spriteset == 6 && npcinfo[i].attackattempt < ticks) { - if(npcinfo[i].attacknext < ticks && npcinfo[i].pause < ticks && npcinfo[i].attacking == 0) { + if (npcinfo[i].spriteset == 6 && npcinfo[i].attackattempt < ticks) { + if (npcinfo[i].attacknext < ticks && npcinfo[i].pause < ticks && npcinfo[i].attacking == 0) { npx = npcinfo[i].x; npy = npcinfo[i].y; @@ -5949,31 +5916,31 @@ void game_updnpcs() ydif = player.py - npy; pass = 0; - if(abs(xdif) < 48 && abs(ydif) < 6) pass = 1; - if(abs(ydif) < 48 && abs(xdif) < 6) pass = 2; + if (abs(xdif) < 48 && abs(ydif) < 6) pass = 1; + if (abs(ydif) < 48 && abs(xdif) < 6) pass = 2; - if(pass > 0) { + if (pass > 0) { npcinfo[i].attackattempt = ticks + 100; - if((int)(RND() * 2) == 0) { + if ((int)(RND() * 2) == 0) { npcinfo[i].attacking = 1; npcinfo[i].attackframe = 0; - if(pass == 1 && xdif < 0) { + if (pass == 1 && xdif < 0) { nnxa = npx - 8; nnya = npy + 4; nnxb = npx - 48 - 8; nnyb = npy + 4; - } else if(pass == 1 && xdif > 0) { + } else if (pass == 1 && xdif > 0) { nnxa = npx + 16; nnya = npy + 4; nnxb = npx + 16 + 48; nnyb = npy + 4; - } else if(pass == 2 && ydif < 0) { + } else if (pass == 2 && ydif < 0) { nnya = npy; nnxa = npx + 4; nnyb = npy - 48; nnxb = npx + 4; - } else if(pass == 2 && ydif > 0) { + } else if (pass == 2 && ydif > 0) { nnya = npy + 20; nnxa = npx + 4; nnyb = npy + 20 + 48; @@ -5987,15 +5954,15 @@ void game_updnpcs() } // wizard1 specific - if(npcinfo[i].spriteset == 7) { - if(npcinfo[i].attacknext < ticks && npcinfo[i].pause < ticks && npcinfo[i].attacking == 0) { + if (npcinfo[i].spriteset == 7) { + if (npcinfo[i].attacknext < ticks && npcinfo[i].pause < ticks && npcinfo[i].attacking == 0) { npcinfo[i].attacking = 1; npcinfo[i].attackframe = 0; game_castspell(9, npcinfo[i].x, npcinfo[i].y, player.px, player.py, i); } - if(npcinfo[i].castpause < ticks) { + if (npcinfo[i].castpause < ticks) { // game_castspell 6, npcinfo[i].x, npcinfo[i].y, player.px, player.py, i // npcinfo[i].castpause = ticks + 12000 } @@ -6003,8 +5970,8 @@ void game_updnpcs() } // spriteset6 specific - if(npcinfo[i].spriteset == 8 && npcinfo[i].attackattempt < ticks) { - if(npcinfo[i].attacknext < ticks && npcinfo[i].pause < ticks && npcinfo[i].attacking == 0) { + if (npcinfo[i].spriteset == 8 && npcinfo[i].attackattempt < ticks) { + if (npcinfo[i].attacknext < ticks && npcinfo[i].pause < ticks && npcinfo[i].attacking == 0) { npx = npcinfo[i].x; npy = npcinfo[i].y; @@ -6012,34 +5979,34 @@ void game_updnpcs() ydif = player.py - npy; pass = 0; - if(abs(xdif) < 56 && abs(ydif) < 6) pass = 1; - if(abs(ydif) < 56 && abs(xdif) < 6) pass = 2; + if (abs(xdif) < 56 && abs(ydif) < 6) pass = 1; + if (abs(ydif) < 56 && abs(xdif) < 6) pass = 2; - if(pass > 0) { + if (pass > 0) { npcinfo[i].attackattempt = ticks + 100; - if((int)(RND() * 2) == 0) { + if ((int)(RND() * 2) == 0) { npcinfo[i].attacking = 1; npcinfo[i].attackframe = 0; - if(pass == 1 && xdif < 0) { + if (pass == 1 && xdif < 0) { nnxa = npx - 8; nnya = npy + 4; nnxb = npx - 56 - 8; nnyb = npy + 4; npcinfo[i].walkdir = 2; - } else if(pass == 1 && xdif > 0) { + } else if (pass == 1 && xdif > 0) { nnxa = npx + 16; nnya = npy + 4; nnxb = npx + 16 + 56; nnyb = npy + 4; npcinfo[i].walkdir = 3; - } else if(pass == 2 && ydif < 0) { + } else if (pass == 2 && ydif < 0) { nnya = npy; nnxa = npx + 4; nnyb = npy - 56; nnxb = npx + 4; npcinfo[i].walkdir = 0; - } else if(pass == 2 && ydif > 0) { + } else if (pass == 2 && ydif > 0) { nnya = npy + 20; nnxa = npx + 4; nnyb = npy + 20 + 56; @@ -6054,45 +6021,45 @@ void game_updnpcs() } // twowing specific - if(npcinfo[i].spriteset == 9) { - if(npcinfo[i].attacknext < ticks && npcinfo[i].pause < ticks && npcinfo[i].attacking == 0) { - npx = npcinfo[i].bodysection[7].x; - npy = npcinfo[i].bodysection[7].y; + if (npcinfo[i].spriteset == 9) { + if (npcinfo[i].attacknext < ticks && npcinfo[i].pause < ticks && npcinfo[i].attacking == 0) { + npx = npcinfo[i].bodysection[7].x; + npy = npcinfo[i].bodysection[7].y; - xdif = player.px - npx; - ydif = player.py - npy; + xdif = player.px - npx; + ydif = player.py - npy; - if(abs(xdif) < 24 && abs(ydif) < 24) { - float dist = sqrt(xdif * xdif + ydif * ydif); + if (abs(xdif) < 24 && abs(ydif) < 24) { + float dist = sqrt(xdif * xdif + ydif * ydif); - if((dist) < 24) { - if(menabled == 1 && config.effects == 1) { - int snd = Mix_PlayChannel(-1, sfx[sndbite], 0); - Mix_Volume(snd, config.effectsvol); - } + if ((dist) < 24) { + if (menabled == 1 && config.effects == 1) { + int snd = Mix_PlayChannel(-1, sfx[sndbite], 0); + Mix_Volume(snd, config.effectsvol); + } - npcinfo[i].attacking = 1; - npcinfo[i].attackframe = 0; + npcinfo[i].attacking = 1; + npcinfo[i].attackframe = 0; - npcinfo[i].headtargetx[0] = player.px + 12; - npcinfo[i].headtargety[0] = player.py - 4; - } + npcinfo[i].headtargetx[0] = player.px + 12; + npcinfo[i].headtargety[0] = player.py - 4; } + } } - if(npcinfo[i].attacking == 0 && npcinfo[i].castpause < ticks) { + if (npcinfo[i].attacking == 0 && npcinfo[i].castpause < ticks) { npcinfo[i].swayspd = 4; // sway code npcinfo[i].swayangle = npcinfo[i].swayangle + npcinfo[i].swayspd * fpsr; - if(npcinfo[i].swayangle >= 360) npcinfo[i].swayangle = npcinfo[i].swayangle - 360; + if (npcinfo[i].swayangle >= 360) npcinfo[i].swayangle = npcinfo[i].swayangle - 360; npcinfo[i].headtargetx[0] = npcinfo[i].x + (24 - npcinfo[i].swayspd / 2) * sin(3.14159 / 180 * npcinfo[i].swayangle) + 12; npcinfo[i].headtargety[0] = npcinfo[i].y - 36 + 16 + 8 * sin(3.14159 * 2 / 180 * npcinfo[i].swayangle); } - if(dospell == 1) { + if (dospell == 1) { npcinfo[i].pause = ticks + 3000; npcinfo[i].attacknext = ticks + 5000; npcinfo[i].castpause = ticks + 3000; @@ -6114,7 +6081,7 @@ void game_updnpcs() npcinfo[i].bodysection[0].x = npcinfo[i].x + 12; npcinfo[i].bodysection[0].y = npcinfo[i].y + 12; - for(int f = 6; f >= 1; f--) { + for (int f = 6; f >= 1; f--) { xdif = npcinfo[i].bodysection[f + 1].x - npcinfo[i].bodysection[f - 1].x; ydif = npcinfo[i].bodysection[f + 1].y - npcinfo[i].bodysection[f - 1].y; @@ -6128,18 +6095,18 @@ void game_updnpcs() } // dragon2 specific - if(npcinfo[i].spriteset == 10 && npcinfo[i].attackattempt < ticks) { - if(npcinfo[i].attacknext < ticks && npcinfo[i].pause < ticks && npcinfo[i].attacking == 0) { + if (npcinfo[i].spriteset == 10 && npcinfo[i].attackattempt < ticks) { + if (npcinfo[i].attacknext < ticks && npcinfo[i].pause < ticks && npcinfo[i].attacking == 0) { npx = npcinfo[i].x; npy = npcinfo[i].y; xdif = player.px - npx; ydif = player.py - npy; - if(abs(xdif) < 32 && abs(ydif) < 32) { + if (abs(xdif) < 32 && abs(ydif) < 32) { npcinfo[i].attackattempt = ticks + 100; - if((int)(RND() * 2) == 0) { - if(menabled == 1 && config.effects == 1) { + if ((int)(RND() * 2) == 0) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndenemyhit], 0); Mix_Volume(snd, config.effectsvol); } @@ -6153,18 +6120,18 @@ void game_updnpcs() // endboss specific - if(npcinfo[i].spriteset == 11 && npcinfo[i].attackattempt < ticks) { - if(npcinfo[i].attacknext < ticks && npcinfo[i].pause < ticks && npcinfo[i].attacking == 0) { + if (npcinfo[i].spriteset == 11 && npcinfo[i].attackattempt < ticks) { + if (npcinfo[i].attacknext < ticks && npcinfo[i].pause < ticks && npcinfo[i].attacking == 0) { npx = npcinfo[i].x; npy = npcinfo[i].y; xdif = player.px - npx; ydif = player.py - npy; - if(abs(xdif) < 38 && abs(ydif) < 38) { + if (abs(xdif) < 38 && abs(ydif) < 38) { npcinfo[i].attackattempt = ticks + 100; - if((int)(RND() * 2) == 0) { - if(menabled == 1 && config.effects == 1) { + if ((int)(RND() * 2) == 0) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndice], 0); Mix_Volume(snd, config.effectsvol); } @@ -6177,7 +6144,8 @@ void game_updnpcs() } - int dist; float damage; + int dist; + float damage; npx = npcinfo[i].x; npy = npcinfo[i].y; @@ -6190,22 +6158,22 @@ void game_updnpcs() rcSrc.w = 3; rcSrc.h = 3; - if(npcinfo[i].pause < ticks) SDL_FillRect(clipbg, &rcSrc, i); + if (npcinfo[i].pause < ticks) SDL_FillRect(clipbg, &rcSrc, i); pass = 0; - if(npcinfo[i].attacking == 1) pass = 1; - if(npcinfo[i].spriteset == 5) { - if(npcinfo[i].attacking2[0] == 1) pass = 1; - if(npcinfo[i].attacking2[1] == 1) pass = 1; - if(npcinfo[i].attacking2[2] == 1) pass = 1; + if (npcinfo[i].attacking == 1) pass = 1; + if (npcinfo[i].spriteset == 5) { + if (npcinfo[i].attacking2[0] == 1) pass = 1; + if (npcinfo[i].attacking2[1] == 1) pass = 1; + if (npcinfo[i].attacking2[2] == 1) pass = 1; } - if(pass == 1) { + if (pass == 1) { // spriteset1 specific - if(npcinfo[i].spriteset == 1) { + if (npcinfo[i].spriteset == 1) { npcinfo[i].attackframe = npcinfo[i].attackframe + npcinfo[i].attackspd * fpsr; - if(npcinfo[i].attackframe >= 16) { + if (npcinfo[i].attackframe >= 16) { npcinfo[i].attackframe = 0; npcinfo[i].attacking = 0; npcinfo[i].attacknext = ticks + npcinfo[i].attackdelay; @@ -6221,18 +6189,18 @@ void game_updnpcs() dist = 10; - if(abs(xdif) < dist && abs(ydif) < dist && player.pause < ticks) { + if (abs(xdif) < dist && abs(ydif) < dist && player.pause < ticks) { npcinfo[i].attacknext = ticks + npcinfo[i].attackdelay; // npcinfo[i].attackframe = 0; // npcinfo[i].attacking = 0; damage = (float)npcinfo[i].attackdamage * (0.5 + RND() * 1.0); - if(player.hp > 0) game_damageplayer(damage); + if (player.hp > 0) game_damageplayer(damage); } } - if(npcinfo[i].spriteset == 2) { + if (npcinfo[i].spriteset == 2) { // targethead code xdif = npcinfo[i].bodysection[7].x - npcinfo[i].headtargetx[0]; ydif = npcinfo[i].bodysection[7].y - npcinfo[i].headtargety[0]; @@ -6243,7 +6211,7 @@ void game_updnpcs() npcinfo[i].bodysection[0].x = npcinfo[i].x + 12; npcinfo[i].bodysection[0].y = npcinfo[i].y + 12; - for(int f = 6; f >= 1; f--) { + for (int f = 6; f >= 1; f--) { xdif = npcinfo[i].bodysection[f + 1].x - npcinfo[i].bodysection[f - 1].x; ydif = npcinfo[i].bodysection[f + 1].y - npcinfo[i].bodysection[f - 1].y; @@ -6255,7 +6223,7 @@ void game_updnpcs() } npcinfo[i].attackframe = npcinfo[i].attackframe + npcinfo[i].attackspd * fpsr; - if(npcinfo[i].attackframe >= 16) { + if (npcinfo[i].attackframe >= 16) { npcinfo[i].attackframe = 0; npcinfo[i].attacking = 0; npcinfo[i].attacknext = ticks + npcinfo[i].attackdelay; @@ -6271,20 +6239,20 @@ void game_updnpcs() dist = 8; - if(abs(xdif) < dist && abs(ydif) < dist && player.pause < ticks) { + if (abs(xdif) < dist && abs(ydif) < dist && player.pause < ticks) { npcinfo[i].attacknext = ticks + npcinfo[i].attackdelay; // npcinfo[i].attackframe = 0 // npcinfo[i].attacking = 0 damage = (float)npcinfo[i].attackdamage * (1.0 + (RND() * 0.5)); - if(player.hp > 0) game_damageplayer(damage); + if (player.hp > 0) game_damageplayer(damage); } } // firehydra - if(npcinfo[i].spriteset == 5) { - for(int ff = 0; ff <= 2; ff++) { - if(npcinfo[i].attacking2[ff] == 1) { + if (npcinfo[i].spriteset == 5) { + for (int ff = 0; ff <= 2; ff++) { + if (npcinfo[i].attacking2[ff] == 1) { xdif = npcinfo[i].bodysection[10 * ff + 9].x - npcinfo[i].headtargetx[ff]; ydif = npcinfo[i].bodysection[10 * ff + 9].y - npcinfo[i].headtargety[ff]; @@ -6294,7 +6262,7 @@ void game_updnpcs() npcinfo[i].bodysection[10 * ff].x = npcinfo[i].x + 12 + 8 * cos(3.141592 * 2 * (itemyloc / 16 + ff * 120 / 360)); npcinfo[i].bodysection[10 * ff].y = npcinfo[i].y + 12 + 8 * sin(3.141592 * 2 * (itemyloc / 16 + ff * 120 / 360)); - for(int f = 8; f >= 1; f--) { + for (int f = 8; f >= 1; f--) { xdif = npcinfo[i].bodysection[ff * 10 + f + 1].x - npcinfo[i].bodysection[ff * 10 + f - 1].x; ydif = npcinfo[i].bodysection[ff * 10 + f + 1].y - npcinfo[i].bodysection[ff * 10 + f - 1].y; @@ -6306,7 +6274,7 @@ void game_updnpcs() } npcinfo[i].attackframe2[ff] = npcinfo[i].attackframe2[ff] + npcinfo[i].attackspd * fpsr; - if(npcinfo[i].attackframe2[ff] >= 16) { + if (npcinfo[i].attackframe2[ff] >= 16) { npcinfo[i].attackframe2[ff] = 0; npcinfo[i].attacking2[ff] = 0; npcinfo[i].attacknext2[ff] = ticks + npcinfo[i].attackdelay; @@ -6322,12 +6290,12 @@ void game_updnpcs() dist = 8; - if(abs(xdif) < dist && abs(ydif) < dist && player.pause < ticks) { + if (abs(xdif) < dist && abs(ydif) < dist && player.pause < ticks) { npcinfo[i].attacknext2[ff] = ticks + npcinfo[i].attackdelay; // npcinfo[i].attackframe2(ff) = 0 // npcinfo[i].attacking2(ff) = 0 damage = (float)npcinfo[i].attackdamage * (1.0 + RND() * 0.5); - if(player.hp > 0) game_damageplayer(damage); + if (player.hp > 0) game_damageplayer(damage); } } } @@ -6335,7 +6303,7 @@ void game_updnpcs() } // twowing specific - if(npcinfo[i].spriteset == 9) { + if (npcinfo[i].spriteset == 9) { // targethead code xdif = npcinfo[i].bodysection[7].x - npcinfo[i].headtargetx[0]; ydif = npcinfo[i].bodysection[7].y - npcinfo[i].headtargety[0]; @@ -6346,7 +6314,7 @@ void game_updnpcs() npcinfo[i].bodysection[0].x = npcinfo[i].x + 12; npcinfo[i].bodysection[0].y = npcinfo[i].y + 12; - for(int f = 6; f >= 1; f--) { + for (int f = 6; f >= 1; f--) { xdif = npcinfo[i].bodysection[f + 1].x - npcinfo[i].bodysection[f - 1].x; ydif = npcinfo[i].bodysection[f + 1].y - npcinfo[i].bodysection[f - 1].y; @@ -6358,7 +6326,7 @@ void game_updnpcs() } npcinfo[i].attackframe = npcinfo[i].attackframe + npcinfo[i].attackspd * fpsr; - if(npcinfo[i].attackframe >= 16) { + if (npcinfo[i].attackframe >= 16) { npcinfo[i].attackframe = 0; npcinfo[i].attacking = 0; npcinfo[i].attacknext = ticks + npcinfo[i].attackdelay; @@ -6374,20 +6342,20 @@ void game_updnpcs() dist = 8; - if(abs(xdif) < dist && abs(ydif) < dist && player.pause < ticks) { + if (abs(xdif) < dist && abs(ydif) < dist && player.pause < ticks) { npcinfo[i].attacknext = ticks + npcinfo[i].attackdelay; // npcinfo[i].attackframe = 0 // npcinfo[i].attacking = 0 damage = (float)npcinfo[i].attackdamage * (1.0 + RND() * 0.5); - if(player.hp > 0) game_damageplayer(damage); + if (player.hp > 0) game_damageplayer(damage); } } // dragon 2 specific - if(npcinfo[i].spriteset == 10) { + if (npcinfo[i].spriteset == 10) { npcinfo[i].attackframe = npcinfo[i].attackframe + npcinfo[i].attackspd * fpsr; - if(npcinfo[i].attackframe >= 16) { + if (npcinfo[i].attackframe >= 16) { npcinfo[i].attackframe = 0; npcinfo[i].attacking = 0; npcinfo[i].attacknext = ticks + npcinfo[i].attackdelay; @@ -6403,19 +6371,19 @@ void game_updnpcs() dist = 16 + npcinfo[i].attackframe; - if(abs(xdif) < dist && abs(ydif) < dist && player.pause < ticks) { + if (abs(xdif) < dist && abs(ydif) < dist && player.pause < ticks) { npcinfo[i].attacknext = ticks + npcinfo[i].attackdelay; // npcinfo[i].attackframe = 0 // npcinfo[i].attacking = 0 damage = (float)npcinfo[i].attackdamage * (0.5 + RND() * 1.0); - if(player.hp > 0) game_damageplayer(damage); + if (player.hp > 0) game_damageplayer(damage); } } // endboss specific - if(npcinfo[i].spriteset == 11) { + if (npcinfo[i].spriteset == 11) { npcinfo[i].attackframe = npcinfo[i].attackframe + npcinfo[i].attackspd * fpsr; - if(npcinfo[i].attackframe >= 16) { + if (npcinfo[i].attackframe >= 16) { npcinfo[i].attackframe = 0; npcinfo[i].attacking = 0; npcinfo[i].attacknext = ticks + npcinfo[i].attackdelay; @@ -6431,12 +6399,12 @@ void game_updnpcs() dist = 36; - if(abs(xdif) < dist && abs(ydif) < dist && player.pause < ticks) { + if (abs(xdif) < dist && abs(ydif) < dist && player.pause < ticks) { npcinfo[i].attacknext = ticks + npcinfo[i].attackdelay; // npcinfo[i].attackframe = 0 // npcinfo[i].attacking = 0 damage = (float)npcinfo[i].attackdamage * (0.5 + RND() * 1.0); - if(player.hp > 0) game_damageplayer(damage); + if (player.hp > 0) game_damageplayer(damage); } } } @@ -6445,8 +6413,7 @@ void game_updnpcs() } } -void game_updspells() -{ +void game_updspells() { int foundel[5]; float npx, npy; long cl1, cl2, cl3; @@ -6454,12 +6421,12 @@ void game_updspells() float xloc = 0, yloc = 0, xst, yst, xdif, ydif; - for(int i = 0; i < MAXSPELL; i++) { - if(spellinfo[i].frame > 0) { + for (int i = 0; i < MAXSPELL; i++) { + if (spellinfo[i].frame > 0) { int spellnum = spellinfo[i].spellnum; // water - if(spellnum == 0 && forcepause == 0) { + if (spellnum == 0 && forcepause == 0) { float fr = (32 - spellinfo[i].frame); ll[0][0] = -2; @@ -6471,11 +6438,11 @@ void game_updspells() ll[3][0] = 4; ll[3][1] = -2; - for(int f = 0; f <= 3; f++) { - if(fr > f * 4 && fr < f * 4 + 16) { + for (int f = 0; f <= 3; f++) { + if (fr > f * 4 && fr < f * 4 + 16) { float alf = 255; - if(fr < f * 4 + 8) { + if (fr < f * 4 + 8) { int fi = (int)((fr - f * 4) * 3) % 4; rcSrc.x = 32 + fi * 16; rcSrc.y = 80; @@ -6491,11 +6458,11 @@ void game_updspells() alf = 255 * ((fr - f * 4) / 8); } - if(fr >= f * 4 + 8) { + if (fr >= f * 4 + 8) { int fi = 0; // ?? - if(f == 0 || f == 2) fi = 0; - if(f == 1 || f == 3) fi = 1; + if (f == 0 || f == 2) fi = 0; + if (f == 1 || f == 3) fi = 1; rcSrc.x = 32 + fi * 16; rcSrc.y = 80; rcSrc.w = 16; @@ -6517,23 +6484,23 @@ void game_updspells() alf = 255; } - if(xloc > -16 && xloc < 304 && yloc > -16 && yloc < 224) { + if (xloc > -16 && xloc < 304 && yloc > -16 && yloc < 224) { SDL_SetAlpha(spellimg, SDL_SRCALPHA, alf); SDL_BlitSurface(spellimg, &rcSrc, videobuffer, &rcDest); SDL_SetAlpha(spellimg, SDL_SRCALPHA, 255); - if(spellinfo[i].damagewho == 0) { - for(int e = 1; e <= lastnpc; e++) { + if (spellinfo[i].damagewho == 0) { + for (int e = 1; e <= lastnpc; e++) { xdif = (xloc + 16) - (npcinfo[e].x + 12); ydif = (yloc + 16) - (npcinfo[e].y + 12); - if((abs(xdif) < 16 && abs(ydif) < 16)) { + if ((abs(xdif) < 16 && abs(ydif) < 16)) { float damage = (float)player.spelldamage * (1.0 + RND() * 0.5) * (float)spellinfo[i].strength; - if(npcinfo[e].hp > 0 && npcinfo[e].pause < ticks) { + if (npcinfo[e].hp > 0 && npcinfo[e].pause < ticks) { game_damagenpc(e, damage, 1); - if(menabled == 1 && config.effects == 1) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndice], 0); Mix_Volume(snd, config.effectsvol); } @@ -6543,12 +6510,12 @@ void game_updspells() } // check for post damage - if(nposts > 0) { - for(int e = 0; e <= nposts - 1; e++) { + if (nposts > 0) { + for (int e = 0; e <= nposts - 1; e++) { xdif = (xloc + 16) - (postinfo[e][0] + 8); ydif = (yloc + 16) - (postinfo[e][1] + 8); - if((abs(xdif) < 16 && abs(ydif) < 16)) { + if ((abs(xdif) < 16 && abs(ydif) < 16)) { objmapf[curmap][(int)postinfo[e][0] / 16][(int)postinfo[e][1] / 16] = 1; objmap[(int)postinfo[e][0] / 16][(int)postinfo[e][1] / 16] = -1; @@ -6561,7 +6528,7 @@ void game_updspells() game_addFloatIcon(99, postinfo[e][0], postinfo[e][1]); - if(menabled == 1 && config.effects == 1) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndice], 0); Mix_Volume(snd, config.effectsvol); } @@ -6574,10 +6541,10 @@ void game_updspells() } // metal - if(spellnum == 1 && forcepause == 0) { + if (spellnum == 1 && forcepause == 0) { float xdif, ydif; int npc; - int fr = (int)((32 - spellinfo[i].frame)*4) % 3; + int fr = (int)((32 - spellinfo[i].frame) * 4) % 3; rcSrc.x = fr * 48; rcSrc.y = 0; @@ -6586,8 +6553,8 @@ void game_updspells() float c1 = (32 - spellinfo[i].frame) / 16; - float halfx = (spellinfo[i].homex-12) + ((spellinfo[i].enemyx-12) - (spellinfo[i].homex-12)) / 2; - float halfy = (spellinfo[i].homey-12) + ((spellinfo[i].enemyy-12) - (spellinfo[i].homey-12)) / 2; + float halfx = (spellinfo[i].homex - 12) + ((spellinfo[i].enemyx - 12) - (spellinfo[i].homex - 12)) / 2; + float halfy = (spellinfo[i].homey - 12) + ((spellinfo[i].enemyy - 12) - (spellinfo[i].homey - 12)) / 2; float wdth = (halfx - spellinfo[i].homex) * 1.2; float hight = (halfy - spellinfo[i].homey) * 1.2; @@ -6601,19 +6568,19 @@ void game_updspells() SDL_BlitSurface(spellimg, &rcSrc, videobuffer, &rcDest); spellinfo[i].frame = spellinfo[i].frame - 0.2 * fpsr; - if(spellinfo[i].frame < 0) spellinfo[i].frame = 0; + if (spellinfo[i].frame < 0) spellinfo[i].frame = 0; - if(spellinfo[i].damagewho == 0) { - for(int e = 1; e <= lastnpc; e++) { + if (spellinfo[i].damagewho == 0) { + for (int e = 1; e <= lastnpc; e++) { xdif = (xloc + 24) - (npcinfo[e].x + 12); ydif = (yloc + 24) - (npcinfo[e].y + 12); - if((abs(xdif) < 24 && abs(ydif) < 24)) { + if ((abs(xdif) < 24 && abs(ydif) < 24)) { float damage = (float)player.spelldamage * (1.0 + RND() * 0.5) * (float)spellinfo[i].strength; - if(npcinfo[e].hp > 0 && npcinfo[e].pause < ticks) { + if (npcinfo[e].hp > 0 && npcinfo[e].pause < ticks) { game_damagenpc(e, damage, 1); - if(menabled == 1 && config.effects == 1) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndmetalhit], 0); Mix_Volume(snd, config.effectsvol); } @@ -6622,10 +6589,10 @@ void game_updspells() } } - if(spellinfo[i].damagewho == 1) { + if (spellinfo[i].damagewho == 1) { // --------- boss 1 specific - if(spellinfo[i].frame == 0 && npcinfo[spellinfo[i].npc].spriteset == 3) { + if (spellinfo[i].frame == 0 && npcinfo[spellinfo[i].npc].spriteset == 3) { npc = spellinfo[i].npc; npcinfo[npc].attackframe = 0; npcinfo[npc].attacking = 0; @@ -6636,7 +6603,7 @@ void game_updspells() // --------------- // --------- blackknight specific - if(spellinfo[i].frame == 0 && npcinfo[spellinfo[i].npc].spriteset == 4) { + if (spellinfo[i].frame == 0 && npcinfo[spellinfo[i].npc].spriteset == 4) { npc = spellinfo[i].npc; npcinfo[npc].attackframe = 0; npcinfo[npc].attacking = 0; @@ -6649,15 +6616,15 @@ void game_updspells() xdif = (xloc + 24) - (player.px + 12); ydif = (yloc + 24) - (player.py + 12); - if((abs(xdif) < 24 && abs(ydif) < 24) && player.pause < ticks) { + if ((abs(xdif) < 24 && abs(ydif) < 24) && player.pause < ticks) { npx = player.px; npy = player.py; float damage = (float)npcinfo[spellinfo[i].npc].spelldamage * (1.0 + RND() * 0.5); - if(player.hp > 0) { + if (player.hp > 0) { game_damageplayer(damage); - if(menabled == 1 && config.effects == 1) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndmetalhit], 0); Mix_Volume(snd, config.effectsvol); } @@ -6667,12 +6634,12 @@ void game_updspells() // check for(int post damage - if(nposts > 0) { - for(int e = 0; e <= nposts - 1; e++) { + if (nposts > 0) { + for (int e = 0; e <= nposts - 1; e++) { xdif = (xloc + 24) - (postinfo[e][0] + 8); ydif = (yloc + 24) - (postinfo[e][1] + 8); - if((abs(xdif) < 24 && abs(ydif) < 24)) { + if ((abs(xdif) < 24 && abs(ydif) < 24)) { objmapf[curmap][(int)postinfo[e][0] / 16][(int)postinfo[e][1] / 16] = 1; objmap[(int)postinfo[e][0] / 16][(int)postinfo[e][1] / 16] = -1; @@ -6685,7 +6652,7 @@ void game_updspells() game_addFloatIcon(99, postinfo[e][0], postinfo[e][1]); - if(menabled == 1 && config.effects == 1) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndmetalhit], 0); Mix_Volume(snd, config.effectsvol); } @@ -6695,48 +6662,48 @@ void game_updspells() } // earth - if(spellnum == 2 && forcepause == 0) { + if (spellnum == 2 && forcepause == 0) { float hght = 240 - spellinfo[i].enemyy; - for(int f = 8; f >= 0; f--) { + for (int f = 8; f >= 0; f--) { float fr = (32 - spellinfo[i].frame); - if(fr > f && fr < f + 16) { + if (fr > f && fr < f + 16) { rcSrc.x = 32 * spellinfo[i].rockimg[f]; rcSrc.y = 48; rcSrc.w = 32; rcSrc.h = 32; int scatter = 0; - if(fr < 8 + f) { + if (fr < 8 + f) { xloc = spellinfo[i].enemyx - 4; yloc = spellinfo[i].enemyy * (1 - cos(3.14159 / 2 * (fr - f) / 8)); // ^ 2; yloc *= yloc; } else { scatter = 1; - xloc = spellinfo[i].enemyx - 4 - spellinfo[i].rockdeflect[f] * sin(3.14159 / 2* ((fr - f) - 8) / 8); + xloc = spellinfo[i].enemyx - 4 - spellinfo[i].rockdeflect[f] * sin(3.14159 / 2 * ((fr - f) - 8) / 8); yloc = spellinfo[i].enemyy + hght * (1 - cos(3.14159 / 2 * ((fr - f) - 8) / 8)); } rcDest.x = xloc; rcDest.y = yloc; - if(xloc > -16 && xloc < 304 && yloc > -16 && yloc < 224) { + if (xloc > -16 && xloc < 304 && yloc > -16 && yloc < 224) { SDL_BlitSurface(spellimg, &rcSrc, videobuffer, &rcDest); - if(scatter == 1) { - if(spellinfo[i].damagewho == 0) { - for(int e = 1; e <= lastnpc; e++) { + if (scatter == 1) { + if (spellinfo[i].damagewho == 0) { + for (int e = 1; e <= lastnpc; e++) { xdif = (xloc + 16) - (npcinfo[e].x + 12); ydif = (yloc + 16) - (npcinfo[e].y + 12); - if((abs(xdif) < 16 && abs(ydif) < 16)) { + if ((abs(xdif) < 16 && abs(ydif) < 16)) { float damage = (float)player.spelldamage * (1.0 + RND() * 0.5) * (float)spellinfo[i].strength; - if(npcinfo[e].hp > 0 && npcinfo[e].pause < ticks) { + if (npcinfo[e].hp > 0 && npcinfo[e].pause < ticks) { game_damagenpc(e, damage, 1); - if(menabled == 1 && config.effects == 1) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndrocks], 0); Mix_Volume(snd, config.effectsvol); } @@ -6747,12 +6714,12 @@ void game_updspells() // check for(int post damage - if(nposts > 0) { - for(int e = 0; e <= nposts - 1; e++) { + if (nposts > 0) { + for (int e = 0; e <= nposts - 1; e++) { xdif = (xloc + 16) - (postinfo[e][0] + 8); ydif = (yloc + 16) - (postinfo[e][1] + 8); - if((abs(xdif) < 16 && abs(ydif) < 16)) { + if ((abs(xdif) < 16 && abs(ydif) < 16)) { objmapf[curmap][(int)postinfo[e][0] / 16][(int)postinfo[e][1] / 16] = 1; objmap[(int)postinfo[e][0] / 16][(int)postinfo[e][1] / 16] = -1; @@ -6765,7 +6732,7 @@ void game_updspells() game_addFloatIcon(99, postinfo[e][0], postinfo[e][1]); - if(menabled == 1 && config.effects == 1) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndrocks], 0); Mix_Volume(snd, config.effectsvol); } @@ -6778,11 +6745,11 @@ void game_updspells() } spellinfo[i].frame = spellinfo[i].frame - 0.2 * fpsr; - if(spellinfo[i].frame < 0) spellinfo[i].frame = 0; + if (spellinfo[i].frame < 0) spellinfo[i].frame = 0; } // crystal - if(spellnum == 5) { + if (spellnum == 5) { float fra = (32 - spellinfo[i].frame); int fr = (int)((spellinfo[i].frame) * 2) % 8; @@ -6796,15 +6763,15 @@ void game_updspells() rcDest.y = player.py + 16 - 48; int f = 160; - if(fra < 8) f = 192 * fra / 8; - if(fra > 24) f = 192 * (1 - (fra - 24) / 8); + if (fra < 8) f = 192 * fra / 8; + if (fra > 24) f = 192 * (1 - (fra - 24) / 8); SDL_SetAlpha(spellimg, SDL_SRCALPHA, f); SDL_BlitSurface(spellimg, &rcSrc, videobuffer, &rcDest); SDL_SetAlpha(spellimg, SDL_SRCALPHA, 255); spellinfo[i].frame = spellinfo[i].frame - 0.3 * fpsr; - if(spellinfo[i].frame < 0) { + if (spellinfo[i].frame < 0) { spellinfo[i].frame = 0; forcepause = 0; @@ -6814,35 +6781,35 @@ void game_updspells() int lx = (int)npx / 16; int ly = (int)npy / 16; - for(int f = 0; f < 5; f++) { // !! f < 5 + for (int f = 0; f < 5; f++) { // !! f < 5 foundel[f] = 0; } - for(int xo = -2; xo <= 2; xo++) { - for(int yo = -2; yo <= 2; yo++) { + for (int xo = -2; xo <= 2; xo++) { + for (int yo = -2; yo <= 2; yo++) { int sx = lx + xo; int sy = ly + yo; - if(sx > -1 && sx < 20 && sy > -1 && sy < 15) { - for(int l = 0; l <= 2; l++) { + if (sx > -1 && sx < 20 && sy > -1 && sy < 15) { + for (int l = 0; l <= 2; l++) { int curtile = tileinfo[l][sx][sy][0]; int curtilel = tileinfo[l][sx][sy][1]; - if(curtile > 0) { + if (curtile > 0) { curtile = curtile - 1; int curtilex = curtile % 20; int curtiley = (curtile - curtilex) / 20; int element = elementmap[curtiley][curtilex]; - if(element > -1 && curtilel == 0) foundel[element + 1] = 1; + if (element > -1 && curtilel == 0) foundel[element + 1] = 1; } } int o = objmap[sx][sy]; - if(o > -1) { - if(objectinfo[o][4] == 1) foundel[2] = 1; - if(o == 1 || o == 2) { + if (o > -1) { + if (objectinfo[o][4] == 1) foundel[2] = 1; + if (o == 1 || o == 2) { foundel[2] = 1; foundel[4] = 1; } @@ -6854,14 +6821,14 @@ void game_updspells() char line[256]; strcpy(line, "Found... nothing..."); - for(int f = 0; f < 5; f++) { - if(foundel[f] == 1 && player.foundspell[f] == 0) { + for (int f = 0; f < 5; f++) { + if (foundel[f] == 1 && player.foundspell[f] == 0) { player.foundspell[f] = 1; player.spellcharge[f] = 0; - if(f == 1) strcpy(line, "Found... Water Essence"); - if(f == 2) strcpy(line, "Found... Metal Essence"); - if(f == 3) strcpy(line, "Found... Earth Essence"); - if(f == 4) strcpy(line, "Found... Fire Essence"); + if (f == 1) strcpy(line, "Found... Water Essence"); + if (f == 2) strcpy(line, "Found... Metal Essence"); + if (f == 3) strcpy(line, "Found... Earth Essence"); + if (f == 4) strcpy(line, "Found... Fire Essence"); break; } } @@ -6871,9 +6838,9 @@ void game_updspells() } // room fireballs - if(spellnum == 6 && forcepause == 0) { + if (spellnum == 6 && forcepause == 0) { - if(spellinfo[i].frame > 16) { + if (spellinfo[i].frame > 16) { float fr = (32 - spellinfo[i].frame); SDL_SetAlpha(spellimg, SDL_SRCALPHA, 192 * sin(3.14159 * fr / 4)); @@ -6883,7 +6850,7 @@ void game_updspells() rcSrc.w = 16; rcSrc.h = 16; - for(int ff = 0; ff <= spellinfo[i].nfballs - 1; ff++) { + for (int ff = 0; ff <= spellinfo[i].nfballs - 1; ff++) { xloc = spellinfo[i].fireballs[ff][0] + (int)(RND() * 3) - 1; yloc = spellinfo[i].fireballs[ff][1] + (int)(RND() * 3) - 1; @@ -6903,7 +6870,7 @@ void game_updspells() rcSrc.w = 16; rcSrc.h = 16; - for(int ff = 0; ff <= spellinfo[i].nfballs - 1; ff++) { + for (int ff = 0; ff <= spellinfo[i].nfballs - 1; ff++) { float ax = spellinfo[i].fireballs[ff][0]; float ay = spellinfo[i].fireballs[ff][1]; float bx = player.px + 4; @@ -6916,7 +6883,7 @@ void game_updspells() spellinfo[i].fireballs[ff][2] += tx * 1.2 * fpsr; spellinfo[i].fireballs[ff][3] += ty * 1.2 * fpsr; - if(spellinfo[i].ballon[ff] == 1) { + if (spellinfo[i].ballon[ff] == 1) { spellinfo[i].fireballs[ff][0] = ax + spellinfo[i].fireballs[ff][2] * 0.2 * fpsr; spellinfo[i].fireballs[ff][1] = ay + spellinfo[i].fireballs[ff][3] * 0.2 * fpsr; @@ -6929,32 +6896,32 @@ void game_updspells() SDL_BlitSurface(spellimg, &rcSrc, videobuffer, &rcDest); } - if(xloc < -1 || yloc < -1 || xloc > 304 || yloc > 224) spellinfo[i].ballon[ff] = 0; + if (xloc < -1 || yloc < -1 || xloc > 304 || yloc > 224) spellinfo[i].ballon[ff] = 0; } SDL_SetAlpha(spellimg, SDL_SRCALPHA, 255); } spellinfo[i].frame = spellinfo[i].frame - 0.2 * fpsr; - if(spellinfo[i].frame < 0) spellinfo[i].frame = 0; + if (spellinfo[i].frame < 0) spellinfo[i].frame = 0; - if(spellinfo[i].damagewho == 1) { - for(int ff = 0; ff <= spellinfo[i].nfballs - 1; ff++) { - if(spellinfo[i].ballon[ff] == 1) { + if (spellinfo[i].damagewho == 1) { + for (int ff = 0; ff <= spellinfo[i].nfballs - 1; ff++) { + if (spellinfo[i].ballon[ff] == 1) { xloc = spellinfo[i].fireballs[ff][0] + (int)(RND() * 3) - 1; yloc = spellinfo[i].fireballs[ff][1] + (int)(RND() * 3) - 1; xdif = (xloc + 8) - (player.px + 12); ydif = (yloc + 8) - (player.py + 12); - if((abs(xdif) < 8 && abs(ydif) < 8) && player.pause < ticks) { + if ((abs(xdif) < 8 && abs(ydif) < 8) && player.pause < ticks) { float damage = npcinfo[spellinfo[i].npc].spelldamage * (1 + RND() * 0.5) / 3; - if(player.hp > 0) game_damageplayer(damage); + if (player.hp > 0) game_damageplayer(damage); - if(menabled == 1 && config.effects == 1) { - int snd = Mix_PlayChannel(-1, sfx[sndfire], 0); - Mix_Volume(snd, config.effectsvol); + if (menabled == 1 && config.effects == 1) { + int snd = Mix_PlayChannel(-1, sfx[sndfire], 0); + Mix_Volume(snd, config.effectsvol); } } } @@ -6963,7 +6930,7 @@ void game_updspells() } // lightning bomb - if(spellnum == 8) { + if (spellnum == 8) { cl1 = SDL_MapRGB(videobuffer->format, 0, 32, 204); cl2 = SDL_MapRGB(videobuffer->format, 142, 173, 191); @@ -6975,44 +6942,44 @@ void game_updspells() int apx = px + (int)(RND() * 5 - 2); int apy = py + (int)(RND() * 5 - 2); - for(int f = 0; f <= 0; f++) { // ?? + for (int f = 0; f <= 0; f++) { // ?? int y = apy; int orn = 0; - for(int x = apx; x <= 319; x++) { + for (int x = apx; x <= 319; x++) { int rn = (int)(RND() * 3); - if(orn == 0) y = y - 1; - if(orn == 2) y = y + 1; + if (orn == 0) y = y - 1; + if (orn == 2) y = y + 1; - sys_line(videobuffer,x, y - 1, x, y + 2, cl1); - sys_line(videobuffer,x, y, x, y + 1, cl3); + sys_line(videobuffer, x, y - 1, x, y + 2, cl1); + sys_line(videobuffer, x, y, x, y + 1, cl3); - if(rn == 0) sys_line(videobuffer, x, y + 1, x, y + 1, cl2); - if(rn == 2) sys_line(videobuffer, x, y, x, y, cl2); + if (rn == 0) sys_line(videobuffer, x, y + 1, x, y + 1, cl2); + if (rn == 2) sys_line(videobuffer, x, y, x, y, cl2); orn = rn; - if(spellinfo[i].damagewho == 0) { - for(int e = 1; e <= lastnpc; e++) { + if (spellinfo[i].damagewho == 0) { + for (int e = 1; e <= lastnpc; e++) { xdif = (x + 16) - (npcinfo[e].x + 12); ydif = (y + 16) - (npcinfo[e].y + 12); - if((abs(xdif) < 8 && abs(ydif) < 8)) { + if ((abs(xdif) < 8 && abs(ydif) < 8)) { float damage = 30 * (1 + RND() * 0.5); - if(npcinfo[e].hp > 0 && npcinfo[e].pause < ticks) game_damagenpc(e, damage, 1); + if (npcinfo[e].hp > 0 && npcinfo[e].pause < ticks) game_damagenpc(e, damage, 1); } } } - + // check for post damage - if(nposts > 0) { - for(int e = 0; e <= nposts - 1; e++) { + if (nposts > 0) { + for (int e = 0; e <= nposts - 1; e++) { xdif = (xloc + 16) - (postinfo[e][0] + 8); ydif = (yloc + 16) - (postinfo[e][1] + 8); - if((abs(xdif) < 16 && abs(ydif) < 16)) { + if ((abs(xdif) < 16 && abs(ydif) < 16)) { objmapf[curmap][(int)postinfo[e][0] / 16][(int)postinfo[e][1] / 16] = 1; objmap[(int)postinfo[e][0] / 16][(int)postinfo[e][1] / 16] = -1; @@ -7031,41 +6998,41 @@ void game_updspells() y = apy; orn = 0; - for(int x = apx; x >= 0; x--) { + for (int x = apx; x >= 0; x--) { int rn = (int)(RND() * 3); - if(orn == 0) y = y - 1; - if(orn == 2) y = y + 1; + if (orn == 0) y = y - 1; + if (orn == 2) y = y + 1; - sys_line(videobuffer,x, y - 1, x, y + 2, cl1); - sys_line(videobuffer,x, y, x, y + 1, cl3); + sys_line(videobuffer, x, y - 1, x, y + 2, cl1); + sys_line(videobuffer, x, y, x, y + 1, cl3); - if(rn == 0) sys_line(videobuffer, x, y + 1, x, y + 1, cl2); - if(rn == 2) sys_line(videobuffer, x, y, x, y, cl2); + if (rn == 0) sys_line(videobuffer, x, y + 1, x, y + 1, cl2); + if (rn == 2) sys_line(videobuffer, x, y, x, y, cl2); orn = rn; - if(spellinfo[i].damagewho == 0) { - for(int e = 1; e <= lastnpc; e++) { + if (spellinfo[i].damagewho == 0) { + for (int e = 1; e <= lastnpc; e++) { xdif = (x + 16) - (npcinfo[e].x + 12); ydif = (y + 16) - (npcinfo[e].y + 12); - if((abs(xdif) < 8 && abs(ydif) < 8)) { + if ((abs(xdif) < 8 && abs(ydif) < 8)) { float damage = 30 * (1 + RND() * 0.5); - if(npcinfo[e].hp > 0 && npcinfo[e].pause < ticks) game_damagenpc(e, damage, 1); + if (npcinfo[e].hp > 0 && npcinfo[e].pause < ticks) game_damagenpc(e, damage, 1); } } } // check for post damage - if(nposts > 0) { - for(int e = 0; e <= nposts - 1; e++) { + if (nposts > 0) { + for (int e = 0; e <= nposts - 1; e++) { xdif = (xloc + 16) - (postinfo[e][0] + 8); ydif = (yloc + 16) - (postinfo[e][1] + 8); - if((abs(xdif) < 16 && abs(ydif) < 16)) { + if ((abs(xdif) < 16 && abs(ydif) < 16)) { objmapf[curmap][(int)postinfo[e][0] / 16][(int)postinfo[e][1] / 16] = 1; objmap[(int)postinfo[e][0] / 16][(int)postinfo[e][1] / 16] = -1; @@ -7084,40 +7051,40 @@ void game_updspells() int x = apx; orn = 0; - for(int y = apy; y <= 239; y++) { + for (int y = apy; y <= 239; y++) { int rn = (int)(RND() * 3); - if(orn == 0) x = x - 1; - if(orn == 2) x = x + 1; + if (orn == 0) x = x - 1; + if (orn == 2) x = x + 1; - sys_line(videobuffer,x - 1, y, x + 2, y, cl1); - sys_line(videobuffer,x, y, x + 1, y, cl3); + sys_line(videobuffer, x - 1, y, x + 2, y, cl1); + sys_line(videobuffer, x, y, x + 1, y, cl3); - if(rn == 0) sys_line(videobuffer, x + 1, y, x + 1, y, cl2); - if(rn == 2) sys_line(videobuffer, x, y, x, y, cl2); + if (rn == 0) sys_line(videobuffer, x + 1, y, x + 1, y, cl2); + if (rn == 2) sys_line(videobuffer, x, y, x, y, cl2); orn = rn; - if(spellinfo[i].damagewho == 0) { - for(int e = 1; e <= lastnpc; e++) { + if (spellinfo[i].damagewho == 0) { + for (int e = 1; e <= lastnpc; e++) { xdif = (x + 16) - (npcinfo[e].x + 12); ydif = (y + 16) - (npcinfo[e].y + 12); - if((abs(xdif) < 8 && abs(ydif) < 8)) { + if ((abs(xdif) < 8 && abs(ydif) < 8)) { float damage = 30 * (1 + RND() * 0.5); - if(npcinfo[e].hp > 0 && npcinfo[e].pause < ticks) game_damagenpc(e, damage, 1); + if (npcinfo[e].hp > 0 && npcinfo[e].pause < ticks) game_damagenpc(e, damage, 1); } } } // check for post damage - if(nposts > 0) { - for(int e = 0; e <= nposts - 1; e++) { + if (nposts > 0) { + for (int e = 0; e <= nposts - 1; e++) { xdif = (xloc + 16) - (postinfo[e][0] + 8); ydif = (yloc + 16) - (postinfo[e][1] + 8); - if((abs(xdif) < 16 && abs(ydif) < 16)) { + if ((abs(xdif) < 16 && abs(ydif) < 16)) { objmapf[curmap][(int)postinfo[e][0] / 16][(int)postinfo[e][1] / 16] = 1; objmap[(int)postinfo[e][0] / 16][(int)postinfo[e][1] / 16] = -1; @@ -7136,40 +7103,40 @@ void game_updspells() x = apx; orn = 0; - for(int y = apy; y >= 0; y--) { + for (int y = apy; y >= 0; y--) { int rn = (int)(RND() * 3); - if(orn == 0) x = x - 1; - if(orn == 2) x = x + 1; + if (orn == 0) x = x - 1; + if (orn == 2) x = x + 1; - sys_line(videobuffer,x - 1, y, x + 2, y, cl1); - sys_line(videobuffer,x, y, x + 1, y, cl3); + sys_line(videobuffer, x - 1, y, x + 2, y, cl1); + sys_line(videobuffer, x, y, x + 1, y, cl3); - if(rn == 0) sys_line(videobuffer, x + 1, y, x + 1, y, cl2); - if(rn == 2) sys_line(videobuffer, x, y, x, y, cl2); + if (rn == 0) sys_line(videobuffer, x + 1, y, x + 1, y, cl2); + if (rn == 2) sys_line(videobuffer, x, y, x, y, cl2); orn = rn; - if(spellinfo[i].damagewho == 0) { - for(int e = 1; e <= lastnpc; e++) { + if (spellinfo[i].damagewho == 0) { + for (int e = 1; e <= lastnpc; e++) { xdif = (x + 16) - (npcinfo[e].x + 12); ydif = (y + 16) - (npcinfo[e].y + 12); - if((abs(xdif) < 8 && abs(ydif) < 8)) { + if ((abs(xdif) < 8 && abs(ydif) < 8)) { float damage = 30 * (1 + RND() * 0.5); - if(npcinfo[e].hp > 0 && npcinfo[e].pause < ticks) game_damagenpc(e, damage, 1); + if (npcinfo[e].hp > 0 && npcinfo[e].pause < ticks) game_damagenpc(e, damage, 1); } } } // check for post damage - if(nposts > 0) { - for(int e = 0; e <= nposts - 1; e++) { + if (nposts > 0) { + for (int e = 0; e <= nposts - 1; e++) { xdif = (xloc + 16) - (postinfo[e][0] + 8); ydif = (yloc + 16) - (postinfo[e][1] + 8); - if((abs(xdif) < 16 && abs(ydif) < 16)) { + if ((abs(xdif) < 16 && abs(ydif) < 16)) { objmapf[curmap][(int)postinfo[e][0] / 16][(int)postinfo[e][1] / 16] = 1; objmap[(int)postinfo[e][0] / 16][(int)postinfo[e][1] / 16] = -1; @@ -7188,14 +7155,14 @@ void game_updspells() } spellinfo[i].frame -= 0.5 * fpsr; - if(spellinfo[i].frame < 0) { + if (spellinfo[i].frame < 0) { spellinfo[i].frame = 0; forcepause = 0; } } // wizard 1 lightning - if(spellnum == 9) { + if (spellnum == 9) { cl1 = SDL_MapRGB(videobuffer->format, 0, 32, 204); cl2 = SDL_MapRGB(videobuffer->format, 142, 173, 191); @@ -7209,43 +7176,43 @@ void game_updspells() int x = apx; int orn = 0; - for(int y = 0; y <= apy; y++) { - if(y < 240) { + for (int y = 0; y <= apy; y++) { + if (y < 240) { float xdif, ydif; int rn = (int)(RND() * 3); - if(orn == 0) x = x - 1; - if(orn == 2) x = x + 1; + if (orn == 0) x = x - 1; + if (orn == 2) x = x + 1; - sys_line(videobuffer,x - 1, y, x + 2, y, cl1); - sys_line(videobuffer,x, y, x + 1, y, cl3); + sys_line(videobuffer, x - 1, y, x + 2, y, cl1); + sys_line(videobuffer, x, y, x + 1, y, cl3); - if(rn == 0) sys_line(videobuffer, x + 1, y, x + 1, y, cl2); - if(rn == 2) sys_line(videobuffer, x, y, x, y, cl2); + if (rn == 0) sys_line(videobuffer, x + 1, y, x + 1, y, cl2); + if (rn == 2) sys_line(videobuffer, x, y, x, y, cl2); orn = rn; - if(spellinfo[i].damagewho == 1) { + if (spellinfo[i].damagewho == 1) { xdif = (x + 8) - (player.px + 12); ydif = (y + 8) - (player.py + 12); - if((abs(xdif) < 8 && abs(ydif) < 8) && player.pause < ticks) { + if ((abs(xdif) < 8 && abs(ydif) < 8) && player.pause < ticks) { float damage = ((float)player.hp * 0.75) * (RND() * 0.5 + 0.5); - if(damage < 5) damage = 5; + if (damage < 5) damage = 5; - if(npcinfo[spellinfo[i].npc].spriteset == 12) { - if(damage < 50) damage = 40 + (int)(RND() * 40); + if (npcinfo[spellinfo[i].npc].spriteset == 12) { + if (damage < 50) damage = 40 + (int)(RND() * 40); } - if(player.hp > 0) game_damageplayer(damage); + if (player.hp > 0) game_damageplayer(damage); } } } } spellinfo[i].frame -= 0.5 * fpsr; - if(spellinfo[i].frame < 0) { + if (spellinfo[i].frame < 0) { spellinfo[i].frame = 0; npcinfo[spellinfo[i].npc].attacking = 0; @@ -7258,19 +7225,18 @@ void game_updspells() -void game_updspellsunder() -{ +void game_updspellsunder() { unsigned int dq, *temp; - if(forcepause == 1) return; + if (forcepause == 1) return; - for(int i = 0; i < MAXSPELL; i++) { - if(spellinfo[i].frame > 0) { + for (int i = 0; i < MAXSPELL; i++) { + if (spellinfo[i].frame > 0) { int spellnum = spellinfo[i].spellnum; // water - if(spellnum == 0) { + if (spellnum == 0) { int fra = (32 - spellinfo[i].frame); int fr = (int)((32 - spellinfo[i].frame) * 2) % 4; @@ -7283,26 +7249,26 @@ void game_updspellsunder() rcDest.y = spellinfo[i].enemyy - 8; int f = 160; - if(fra < 8) f = 160 * fra / 8; - if(fra > 24) f = 160 * (1 - (fra - 24) / 8); + if (fra < 8) f = 160 * fra / 8; + if (fra > 24) f = 160 * (1 - (fra - 24) / 8); SDL_SetAlpha(spellimg, SDL_SRCALPHA, f); SDL_BlitSurface(spellimg, &rcSrc, videobuffer, &rcDest); SDL_SetAlpha(spellimg, SDL_SRCALPHA, 255); spellinfo[i].frame = spellinfo[i].frame - 0.2 * fpsr; - if(spellinfo[i].frame < 0) spellinfo[i].frame = 0; + if (spellinfo[i].frame < 0) spellinfo[i].frame = 0; - for(int f = 1; f <= lastnpc; f++) { + for (int f = 1; f <= lastnpc; f++) { int xdif = spellinfo[i].enemyx - npcinfo[f].x; int ydif = spellinfo[i].enemyy - npcinfo[f].y; float dist = sqrt(xdif * xdif + ydif * ydif); - if(dist > 20) dist = 20; + if (dist > 20) dist = 20; - if(dist > 5) { + if (dist > 5) { float ratio = (1 - dist / 25); float newx = npcinfo[f].x + ratio * xdif / 3 * fpsr; @@ -7315,7 +7281,7 @@ void game_updspellsunder() // SDL_UnLockSurface clipbg - if(dq == 0) { + if (dq == 0) { npcinfo[f].x = newx; npcinfo[f].y = newy; // npcinfo[f].castpause = ticks + 200; @@ -7328,7 +7294,7 @@ void game_updspellsunder() temp = clipbg->pixels + sy * clipbg->pitch + sx * clipbg->format->BytesPerPixel; dq = *temp; - if(dq == 0) xpass = 1; + if (dq == 0) xpass = 1; sx = (npcinfo[f].x / 2 + 6); @@ -7336,15 +7302,15 @@ void game_updspellsunder() temp = clipbg->pixels + sy * clipbg->pitch + sx * clipbg->format->BytesPerPixel; dq = *temp; - if(dq == 0) ypass = 1; + if (dq == 0) ypass = 1; - if(ypass == 1) { + if (ypass == 1) { newx = npcinfo[f].x; - } else if(xpass == 1) { + } else if (xpass == 1) { newy = npcinfo[f].y; } - if(xpass == 1 || ypass == 1) { + if (xpass == 1 || ypass == 1) { npcinfo[f].x = newx; npcinfo[f].y = newy; // npcinfo[f].castpause = ticks + 200; @@ -7355,21 +7321,21 @@ void game_updspellsunder() } // fire - if(spellnum == 3) { + if (spellnum == 3) { float fr = (32 - spellinfo[i].frame); - fr = fr*fr * (1 - cos(3.14159 / 4 + 3.14159 / 4 * fr / 32)); + fr = fr * fr * (1 - cos(3.14159 / 4 + 3.14159 / 4 * fr / 32)); - if(fr > 32) fr = 32; + if (fr > 32) fr = 32; float s = 8; - if(spellinfo[i].frame < 8) s = spellinfo[i].frame; + if (spellinfo[i].frame < 8) s = spellinfo[i].frame; int fra = (int)fr; - for(int f = 0; f <= 4; f++) { - for(int x = 0; x <= fra; x += 2) { - if(spellinfo[i].legalive[f] >= x) { + for (int f = 0; f <= 4; f++) { + for (int x = 0; x <= fra; x += 2) { + if (spellinfo[i].legalive[f] >= x) { SDL_SetAlpha(spellimg, SDL_SRCALPHA, 192 * sin(3.14159 * x / 32) * s / 8); float an = 360 / 5 * f + x / 32 * 180; @@ -7384,7 +7350,7 @@ void game_updspellsunder() rcDest.x = (int)xloc; rcDest.y = (int)yloc; - if(xloc > -1 && xloc < 304 && yloc > -1 && yloc < 224) { + if (xloc > -1 && xloc < 304 && yloc > -1 && yloc < 224) { SDL_BlitSurface(spellimg, &rcSrc, videobuffer, &rcDest); int sx = (xloc / 2 + 4); @@ -7392,21 +7358,21 @@ void game_updspellsunder() temp = clipbg->pixels + sy * clipbg->pitch + sx * clipbg->format->BytesPerPixel; dq = *temp; - if(dq > 1000 && x > 4) spellinfo[i].legalive[f] = x; + if (dq > 1000 && x > 4) spellinfo[i].legalive[f] = x; - if(spellinfo[i].damagewho == 0) { - for(int e = 1; e <= lastnpc; e++) { + if (spellinfo[i].damagewho == 0) { + for (int e = 1; e <= lastnpc; e++) { float xdif = (xloc + 8) - (npcinfo[e].x + 12); float ydif = (yloc + 8) - (npcinfo[e].y + 12); - if((abs(xdif) < 8 && abs(ydif) < 8)) { + if ((abs(xdif) < 8 && abs(ydif) < 8)) { float damage = (float)player.spelldamage * (1.0 + RND() * 0.5) * (float)spellinfo[i].strength; - if(npcinfo[e].spriteset == 5) damage = -damage; - if(npcinfo[e].spriteset == 11) damage = -damage; - if(npcinfo[e].hp > 0 && npcinfo[e].pause < ticks) { + if (npcinfo[e].spriteset == 5) damage = -damage; + if (npcinfo[e].spriteset == 11) damage = -damage; + if (npcinfo[e].hp > 0 && npcinfo[e].pause < ticks) { game_damagenpc(e, damage, 1); - if(menabled == 1 && config.effects == 1) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndfire], 0); Mix_Volume(snd, config.effectsvol); } @@ -7415,17 +7381,17 @@ void game_updspellsunder() } } - if(spellinfo[i].damagewho == 1) { + if (spellinfo[i].damagewho == 1) { float xdif = (xloc + 8) - (player.px + 12); float ydif = (yloc + 8) - (player.py + 12); - if((abs(xdif) < 8 && abs(ydif) < 8) && player.pause < ticks) { + if ((abs(xdif) < 8 && abs(ydif) < 8) && player.pause < ticks) { float damage = (float)npcinfo[spellinfo[i].npc].spelldamage * (1.0 + RND() * 0.5); - if(player.hp > 0) { + if (player.hp > 0) { game_damageplayer(damage); - if(menabled == 1 && config.effects == 1) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndfire], 0); Mix_Volume(snd, config.effectsvol); } @@ -7434,12 +7400,12 @@ void game_updspellsunder() } // check for post damage - if(nposts > 0) { - for(int e = 0; e <= nposts - 1; e++) { + if (nposts > 0) { + for (int e = 0; e <= nposts - 1; e++) { float xdif = (xloc + 8) - (postinfo[e][0] + 8); float ydif = (yloc + 8) - (postinfo[e][1] + 8); - if((abs(xdif) < 8 && abs(ydif) < 8)) { + if ((abs(xdif) < 8 && abs(ydif) < 8)) { objmapf[curmap][(int)postinfo[e][0] / 16][(int)postinfo[e][1] / 16] = 1; objmap[(int)postinfo[e][0] / 16][(int)postinfo[e][1] / 16] = -1; @@ -7450,7 +7416,7 @@ void game_updspellsunder() SDL_FillRect(clipbg2, &rcSrc, 0); - if(menabled == 1 && config.effects == 1) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndfire], 0); Mix_Volume(snd, config.effectsvol); } @@ -7467,28 +7433,28 @@ void game_updspellsunder() SDL_SetAlpha(spellimg, SDL_SRCALPHA, 255); spellinfo[i].frame = spellinfo[i].frame - 0.2 * fpsr; - if(spellinfo[i].frame < 0) spellinfo[i].frame = 0; + if (spellinfo[i].frame < 0) spellinfo[i].frame = 0; } // sprite 6 spitfire - if(spellnum == 7) { + if (spellnum == 7) { float xspan = spellinfo[i].enemyx - spellinfo[i].homex; float yspan = spellinfo[i].enemyy - spellinfo[i].homey; float fr = (32 - spellinfo[i].frame); - for(int f = 0; f <= 7; f++) { + for (int f = 0; f <= 7; f++) { int alpha = 0; float xx = 0; - if(fr > f * 2 && fr < f * 2 + 16) xx = fr - f * 2; - if(xx < 8) alpha = 255 * xx / 8; - if(xx > 8) alpha = 255 * (1 - (xx - 8) / 8); + if (fr > f * 2 && fr < f * 2 + 16) xx = fr - f * 2; + if (xx < 8) alpha = 255 * xx / 8; + if (xx > 8) alpha = 255 * (1 - (xx - 8) / 8); float yy = 16 * sin(3.141592 / 2 * xx / 16) - 8; - if(alpha < 0) alpha = 0; - if(alpha > 255) alpha = 255; + if (alpha < 0) alpha = 0; + if (alpha > 255) alpha = 255; SDL_SetAlpha(spellimg, SDL_SRCALPHA, alpha); @@ -7503,19 +7469,19 @@ void game_updspellsunder() rcDest.x = xloc; rcDest.y = yloc; - if(xloc > -16 && xloc < 320 && yloc > -16 && yloc < 240) { + if (xloc > -16 && xloc < 320 && yloc > -16 && yloc < 240) { SDL_BlitSurface(spellimg, &rcSrc, videobuffer, &rcDest); - if(spellinfo[i].damagewho == 1) { + if (spellinfo[i].damagewho == 1) { float xdif = (xloc + 8) - (player.px + 12); float ydif = (yloc + 8) - (player.py + 12); - if((abs(xdif) < 8 && abs(ydif) < 8) && player.pause < ticks && alpha > 64) { + if ((abs(xdif) < 8 && abs(ydif) < 8) && player.pause < ticks && alpha > 64) { float damage = (float)npcinfo[spellinfo[i].npc].spelldamage * (1.0 + RND() * 0.5); - if(player.hp > 0) { + if (player.hp > 0) { game_damageplayer(damage); - if(menabled == 1 && config.effects == 1) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndfire], 0); Mix_Volume(snd, config.effectsvol); } @@ -7530,9 +7496,9 @@ void game_updspellsunder() SDL_SetAlpha(spellimg, SDL_SRCALPHA, 255); spellinfo[i].frame = spellinfo[i].frame - 0.5 * fpsr; - if(spellinfo[i].frame < 0) spellinfo[i].frame = 0; + if (spellinfo[i].frame < 0) spellinfo[i].frame = 0; - if(spellinfo[i].frame == 0) { + if (spellinfo[i].frame == 0) { npcinfo[spellinfo[i].npc].attacking = 0; npcinfo[spellinfo[i].npc].attacknext = ticks + npcinfo[spellinfo[i].npc].attackdelay; } @@ -7541,12 +7507,11 @@ void game_updspellsunder() } } -void sys_initpaths() -{ +void sys_initpaths() { #ifdef __unix__ char line[256]; char *home = getenv("HOME"); - if(!home) return; + if (!home) return; sprintf(line, "%s/.griffon", home); mkdir(line, 0777); @@ -7559,14 +7524,13 @@ void sys_initpaths() #endif } -void sys_initialize() -{ +void sys_initialize() { int result; sys_initpaths(); // init char *floatstri[MAXFLOAT] - for(int i = 0; i < MAXFLOAT; i++) + for (int i = 0; i < MAXFLOAT; i++) floatstri[i] = malloc(64); // 64 bytes each string (should be enough) // set default values @@ -7590,7 +7554,7 @@ void sys_initialize() fullscreen = config.fullscreen | config.hwaccel | config.hwsurface; result = SDL_Init(SDL_INIT_EVERYTHING); - if(result) { + if (result) { printf("Failed to init SDL\n"); exit(1); } @@ -7598,7 +7562,7 @@ void sys_initialize() atexit(SDL_Quit); video = SDL_SetVideoMode(config.scr_width, config.scr_height, config.scr_bpp, fullscreen); // SDL_FULLSCREEN - if(!video) { + if (!video) { printf("Failed to init Video\n"); exit(1); } @@ -7615,7 +7579,7 @@ void sys_initialize() clipbg = SDL_CreateRGBSurface(SDL_SWSURFACE, 320, 240, config.scr_bpp, video->format->Rmask, video->format->Gmask, video->format->Bmask, video->format->Amask); clipbg2 = SDL_DisplayFormat(video); - for(int i = 0; i <= 3; i++) { + for (int i = 0; i <= 3; i++) { char name[128]; sprintf(name, "art/map%i.bmp", i + 1); @@ -7657,7 +7621,7 @@ void sys_initialize() fpsr = 1; nextticks = ticks + 1000; - for(int i = 0; i <= 15; i++) { + for (int i = 0; i <= 15; i++) { playerattackofs[0][i][0] = 0; // -1// -(i + 1) playerattackofs[0][i][1] = -sin(3.14159 * 2 * (i + 1) / 16) * 2 - 1; @@ -7674,8 +7638,7 @@ void sys_initialize() sys_setupAudio(); } -void sys_line(SDL_Surface *buffer, int x1, int y1, int x2, int y2, int col) -{ +void sys_line(SDL_Surface *buffer, int x1, int y1, int x2, int y2, int col) { unsigned int *temp; SDL_LockSurface(buffer); @@ -7683,15 +7646,15 @@ void sys_line(SDL_Surface *buffer, int x1, int y1, int x2, int y2, int col) int xdif = x2 - x1; int ydif = y2 - y1; - if(xdif == 0) { - for(int y = y1; y <= y2; y++) { + if (xdif == 0) { + for (int y = y1; y <= y2; y++) { temp = buffer->pixels + y * buffer->pitch + x1 * buffer->format->BytesPerPixel; *temp = col; } } - if(ydif == 0) { - for(int x = x1; x <= x2; x++) { + if (ydif == 0) { + for (int x = x1; x <= x2; x++) { temp = buffer->pixels + y1 * buffer->pitch + x * buffer->format->BytesPerPixel; *temp = col; } @@ -7700,8 +7663,7 @@ void sys_line(SDL_Surface *buffer, int x1, int y1, int x2, int y2, int col) SDL_UnlockSurface(buffer); } -void sys_LoadAnims() -{ +void sys_LoadAnims() { spellimg = IMG_Load("art/spells.bmp"); SDL_SetColorKey(spellimg, SDL_SRCCOLORKEY, SDL_MapRGB(spellimg->format, 255, 0, 255)); @@ -7849,13 +7811,12 @@ void sys_LoadAnims() SDL_SetColorKey(anims[12], SDL_SRCCOLORKEY, SDL_MapRGB(anims[12]->format, 255, 0, 255)); } -void sys_LoadItemImgs() -{ +void sys_LoadItemImgs() { SDL_Surface *temp; temp = IMG_Load("art/icons.bmp"); - for(int i = 0; i <= 20; i++) { + for (int i = 0; i <= 20; i++) { itemimg[i] = SDL_CreateRGBSurface(SDL_SWSURFACE, 16, 16, config.scr_bpp, video->format->Rmask, video->format->Gmask, video->format->Bmask, video->format->Amask); SDL_SetColorKey(itemimg[i], SDL_SRCCOLORKEY, SDL_MapRGB(itemimg[i]->format, 255, 0, 255)); @@ -7870,14 +7831,13 @@ void sys_LoadItemImgs() SDL_FreeSurface(temp); } -void sys_LoadFont() -{ +void sys_LoadFont() { SDL_Surface *font; font = IMG_Load("art/font.bmp"); - for(int i = 32; i <= 255; i++) - for(int f = 0; f <= 4; f++) { + for (int i = 32; i <= 255; i++) + for (int f = 0; f <= 4; f++) { int i2 = i - 32; fontchr[i2][f] = SDL_CreateRGBSurface(SDL_SWSURFACE, 8, 8, config.scr_bpp, video->format->Rmask, video->format->Gmask, video->format->Bmask, video->format->Amask); @@ -7900,29 +7860,27 @@ void sys_LoadFont() SDL_FreeSurface(font); } -void sys_LoadTiles() -{ +void sys_LoadTiles() { tiles[0] = IMG_Load("art/tx.bmp"); tiles[1] = IMG_Load("art/tx1.bmp"); tiles[2] = IMG_Load("art/tx2.bmp"); tiles[3] = IMG_Load("art/tx3.bmp"); - for(int i = 0; i <= 3; i++) + for (int i = 0; i <= 3; i++) SDL_SetColorKey(tiles[i], SDL_SRCCOLORKEY, SDL_MapRGB(tiles[i]->format, 255, 0, 255)); windowimg = IMG_Load("art/window.bmp"); SDL_SetColorKey(windowimg, SDL_SRCCOLORKEY, SDL_MapRGB(windowimg->format, 255, 0, 255)); } -void sys_LoadTriggers() -{ +void sys_LoadTriggers() { FILE *fp; char line[512]; fp = fopen("data/triggers.dat", "r"); - for(int i = 0; i <= 9999; i++) - for(int a = 0; a <= 8; a++) { + for (int i = 0; i <= 9999; i++) + for (int a = 0; a <= 8; a++) { fgets(line, sizeof(line), fp); sscanf(line, "%i", &triggers[i][a]); } @@ -7930,23 +7888,22 @@ void sys_LoadTriggers() fclose(fp); } -void sys_LoadObjectDB() -{ +void sys_LoadObjectDB() { FILE *fp; char line[512]; fp = fopen("objectdb.dat", "r"); - for(int a = 0; a <= 32; a++) { - for(int b = 0; b <= 5; b++) { + for (int a = 0; a <= 32; a++) { + for (int b = 0; b <= 5; b++) { fgets(line, sizeof(line), fp); sscanf(line, "%i", &objectinfo[a][b]); } - for(int b = 0; b <= 8; b++) { - for(int c = 0; c <= 2; c++) { - for(int d = 0; d <= 2; d++) { - for(int e = 0; e <= 1; e++) { + for (int b = 0; b <= 8; b++) { + for (int c = 0; c <= 2; c++) { + for (int d = 0; d <= 2; d++) { + for (int e = 0; e <= 1; e++) { fgets(line, sizeof(line), fp); sscanf(line, "%i", &objecttile[a][b][c][d][e]); } @@ -7958,11 +7915,10 @@ void sys_LoadObjectDB() fclose(fp); } -void sys_print(SDL_Surface *buffer, char *stri, int xloc, int yloc, int col) -{ +void sys_print(SDL_Surface *buffer, char *stri, int xloc, int yloc, int col) { int l = strlen(stri); - for(int i = 0; i < l; i++) { + for (int i = 0; i < l; i++) { rcDest.x = xloc + i * 8; rcDest.y = yloc; @@ -7970,8 +7926,7 @@ void sys_print(SDL_Surface *buffer, char *stri, int xloc, int yloc, int col) } } -void sys_progress(int w, int wm) -{ +void sys_progress(int w, int wm) { long ccc; ccc = SDL_MapRGB(videobuffer->format, 0, 255, 0); @@ -7983,13 +7938,12 @@ void sys_progress(int w, int wm) SDL_PumpEvents(); } -void sys_setupAudio() -{ +void sys_setupAudio() { SDL_Surface *loadimg; menabled = 1; - if((Mix_Init(MIX_INIT_OGG) & MIX_INIT_OGG) != MIX_INIT_OGG) { + if ((Mix_Init(MIX_INIT_OGG) & MIX_INIT_OGG) != MIX_INIT_OGG) { printf("Failed to init OGG support\n"); exit(1); } @@ -8024,7 +7978,7 @@ void sys_setupAudio() rcDest.y = 116 + 12 + 12; rcDest.h = 8; - if(menabled == 1) { + if (menabled == 1) { mboss = Mix_LoadWAV("music/boss.ogg"); sys_progress(1, 21); mgardens = Mix_LoadWAV("music/gardens.ogg"); @@ -8072,8 +8026,7 @@ void sys_setupAudio() } } -void sys_update() -{ +void sys_update() { unsigned int *temp, bgc; int pa, sx, sy; float opx, opy, spd; @@ -8088,7 +8041,7 @@ void sys_update() fpsr = (float)tickspassed / 24.0; fp++; - if(ticks > nextticks) { + if (ticks > nextticks) { nextticks = ticks + 1000; fps = fp; fp = 0; @@ -8097,9 +8050,9 @@ void sys_update() SDL_LockSurface(clipbg); - if(attacking == 1) { + if (attacking == 1) { player.attackframe += player.attackspd * fpsr; - if(player.attackframe >= 16) { + if (player.attackframe >= 16) { attacking = 0; player.attackframe = 0; player.walkframe = 0; @@ -8107,8 +8060,8 @@ void sys_update() pa = (int)(player.attackframe); - for(int i = 0; i <= pa; i++) { - if(playerattackofs[player.walkdir][i][2] == 0) { + for (int i = 0; i <= pa; i++) { + if (playerattackofs[player.walkdir][i][2] == 0) { playerattackofs[player.walkdir][i][2] = 1; opx = player.px; @@ -8121,7 +8074,7 @@ void sys_update() sy = (int)(player.py / 2 + 10); temp = clipbg->pixels + sy * clipbg->pitch + sx * clipbg->format->BytesPerPixel; bgc = *temp; - if(bgc > 0) { + if (bgc > 0) { player.px = opx; player.py = opy; } @@ -8134,37 +8087,37 @@ void sys_update() game_checkhit(); } - for(int i = 0; i < MAXFLOAT; i++) { - if(floattext[i][0] > 0) { + for (int i = 0; i < MAXFLOAT; i++) { + if (floattext[i][0] > 0) { spd = 0.5 * fpsr; floattext[i][0] = floattext[i][0] - spd; floattext[i][2] = floattext[i][2] - spd; - if(floattext[i][0] < 0) floattext[i][0] = 0; + if (floattext[i][0] < 0) floattext[i][0] = 0; } - if(floaticon[i][0] > 0) { + if (floaticon[i][0] > 0) { spd = 0.5 * fpsr; floaticon[i][0] = floaticon[i][0] - spd; floaticon[i][2] = floaticon[i][2] - spd; - if(floaticon[i][0] < 0) floaticon[i][0] = 0; + if (floaticon[i][0] < 0) floaticon[i][0] = 0; } } - if(player.level == player.maxlevel) player.exp = 0; + if (player.level == player.maxlevel) player.exp = 0; - if(player.exp >= player.nextlevel) { + if (player.exp >= player.nextlevel) { player.level = player.level + 1; game_addFloatText("LEVEL UP!", player.px + 16 - 36, player.py + 16, 3); player.exp = player.exp - player.nextlevel; player.nextlevel = player.nextlevel * 3 / 2; // 1.5 player.maxhp = player.maxhp + player.level * 3; - if(player.maxhp > 999) player.maxhp = 999; + if (player.maxhp > 999) player.maxhp = 999; player.hp = player.maxhp; player.sworddamage = player.level * 14 / 10; player.spelldamage = player.level * 13 / 10; - if(menabled == 1 && config.effects == 1) { + if (menabled == 1 && config.effects == 1) { int snd = Mix_PlayChannel(-1, sfx[sndpowerup], 0); Mix_Volume(snd, config.effectsvol); } @@ -8182,43 +8135,43 @@ void sys_update() SDL_FillRect(clipbg, &rc, 1000); - if(forcepause == 0) { - for(int i = 0; i < 5; i++) { - if(player.foundspell[i] == 1) player.spellcharge[i] += 1 * player.level * 0.01 * fpsr; - if(player.spellcharge[i] > 100) player.spellcharge[i] = 100; + if (forcepause == 0) { + for (int i = 0; i < 5; i++) { + if (player.foundspell[i] == 1) player.spellcharge[i] += 1 * player.level * 0.01 * fpsr; + if (player.spellcharge[i] > 100) player.spellcharge[i] = 100; } - if(player.foundspell[0]) { + if (player.foundspell[0]) { player.spellstrength += 3 * player.level * .01 * fpsr; } player.attackstrength += (30 + 3 * (float)player.level) / 50 * fpsr; } - if(player.attackstrength > 100) player.attackstrength = 100; + if (player.attackstrength > 100) player.attackstrength = 100; - if(player.spellstrength > 100) player.spellstrength = 100; + if (player.spellstrength > 100) player.spellstrength = 100; itemyloc += 0.75 * fpsr; - while(itemyloc >= 16) itemyloc -= 16; + while (itemyloc >= 16) itemyloc -= 16; - if(player.hp <= 0) game_theend(); + if (player.hp <= 0) game_theend(); - if(roomlock == 1) { + if (roomlock == 1) { roomlock = 0; - for(int i = 1; i <= lastnpc; i++) - if(npcinfo[i].hp > 0) roomlock = 1; + for (int i = 1; i <= lastnpc; i++) + if (npcinfo[i].hp > 0) roomlock = 1; } clouddeg += 0.1 * fpsr; - while(clouddeg >= 360) clouddeg = clouddeg - 360; + while (clouddeg >= 360) clouddeg = clouddeg - 360; player.hpflash = player.hpflash + 0.1 * fpsr; - if(player.hpflash >=2) { + if (player.hpflash >= 2) { player.hpflash = 0; player.hpflashb = player.hpflashb + 1; - if(player.hpflashb == 2) player.hpflashb = 0; - if(menabled == 1 && config.effects == 1 && player.hpflashb == 0 && player.hp < player.maxhp / 4) { + if (player.hpflashb == 2) player.hpflashb = 0; + if (menabled == 1 && config.effects == 1 && player.hpflashb == 0 && player.hp < player.maxhp / 4) { int snd = Mix_PlayChannel(-1, sfx[sndbeep], 0); Mix_Volume(snd, config.effectsvol); } @@ -8226,9 +8179,9 @@ void sys_update() // cloudson = 0 - if(itemselon == 1) player.itemselshade = player.itemselshade + 2 * fpsr; - if(player.itemselshade > 24) player.itemselshade = 24; + if (itemselon == 1) player.itemselshade = player.itemselshade + 2 * fpsr; + if (player.itemselshade > 24) player.itemselshade = 24; - for(int i = 0; i <= 4; i++) - if(player.inventory[i] > 9) player.inventory[i] = 9; + for (int i = 0; i <= 4; i++) + if (player.inventory[i] > 9) player.inventory[i] = 9; } |