diff options
| author | James Haley | 2010-09-18 17:35:57 +0000 |
|---|---|---|
| committer | James Haley | 2010-09-18 17:35:57 +0000 |
| commit | 5de507694b0ca43739033d75cf20fcf7ea31a2dd (patch) | |
| tree | 931db2024210a6396df2808c8cd626b7bcb19991 /src/strife/p_spec.c | |
| parent | bf215f516ed4742fd19b920d8a5d3f6738375168 (diff) | |
| download | chocolate-doom-5de507694b0ca43739033d75cf20fcf7ea31a2dd.tar.gz chocolate-doom-5de507694b0ca43739033d75cf20fcf7ea31a2dd.tar.bz2 chocolate-doom-5de507694b0ca43739033d75cf20fcf7ea31a2dd.zip | |
Tons of warnings fixed - now only 7 warnings at warning level 3, and
most of those are outside of our own code (get on those signed/unsigned
mismatches in the midi code, fraggle ;)
Subversion-branch: /branches/strife-branch
Subversion-revision: 2110
Diffstat (limited to 'src/strife/p_spec.c')
| -rw-r--r-- | src/strife/p_spec.c | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/src/strife/p_spec.c b/src/strife/p_spec.c index 467a424c..2111cdc3 100644 --- a/src/strife/p_spec.c +++ b/src/strife/p_spec.c @@ -138,7 +138,7 @@ animdef_t animdefs[] = { false, "F_FAN2", "F_FAN1", 4}, { false, "F_CONVY2", "F_CONVY1", 4}, { false, "F_RDALN4", "F_RDALN1", 4}, - { -1, NULL, NULL, 0}, + { -1, "", "", 0}, }; anim_t anims[MAXANIMS]; @@ -169,35 +169,35 @@ void P_InitPicAnims (void) startname = DEH_String(animdefs[i].startname); endname = DEH_String(animdefs[i].endname); - if (animdefs[i].istexture) - { - // different episode ? - if (R_CheckTextureNumForName(startname) == -1) - continue; + if (animdefs[i].istexture) + { + // different episode ? + if (R_CheckTextureNumForName(startname) == -1) + continue; - lastanim->picnum = R_TextureNumForName(endname); - lastanim->basepic = R_TextureNumForName(startname); - } - else - { - if (W_CheckNumForName(startname) == -1) - continue; + lastanim->picnum = R_TextureNumForName(endname); + lastanim->basepic = R_TextureNumForName(startname); + } + else + { + if (W_CheckNumForName(startname) == -1) + continue; - lastanim->picnum = R_FlatNumForName(endname); - lastanim->basepic = R_FlatNumForName(startname); - } + lastanim->picnum = R_FlatNumForName(endname); + lastanim->basepic = R_FlatNumForName(startname); + } - lastanim->istexture = animdefs[i].istexture; - lastanim->numpics = lastanim->picnum - lastanim->basepic + 1; + lastanim->istexture = animdefs[i].istexture; + lastanim->numpics = lastanim->picnum - lastanim->basepic + 1; - if (lastanim->numpics < 2) - I_Error ("P_InitPicAnims: bad cycle from %s to %s", - startname, endname); - - lastanim->speed = animdefs[i].speed; - lastanim++; + if (lastanim->numpics < 2) + I_Error ("P_InitPicAnims: bad cycle from %s to %s", + startname, endname); + + lastanim->speed = animdefs[i].speed; + lastanim++; } - + } // villsa [STRIFE] terrain type definitions |