summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJames Haley2010-08-30 03:35:57 +0000
committerJames Haley2010-08-30 03:35:57 +0000
commit0fc9462c52b720202ba3bf6e5cc5cf211b4b0df4 (patch)
tree69cd1f77dfb4fd67541fde1d5a357344d919e334 /src
parent2f250f769d0762b78f8753c5be028238a7f32d94 (diff)
downloadchocolate-doom-0fc9462c52b720202ba3bf6e5cc5cf211b4b0df4.tar.gz
chocolate-doom-0fc9462c52b720202ba3bf6e5cc5cf211b4b0df4.tar.bz2
chocolate-doom-0fc9462c52b720202ba3bf6e5cc5cf211b4b0df4.zip
Added animdefs, and raised visplane limit to 200 to match binary.
Subversion-branch: /branches/strife-branch Subversion-revision: 1978
Diffstat (limited to 'src')
-rw-r--r--src/strife/p_spec.c65
-rw-r--r--src/strife/r_plane.c3
2 files changed, 37 insertions, 31 deletions
diff --git a/src/strife/p_spec.c b/src/strife/p_spec.c
index 6316298e..90bc6f8f 100644
--- a/src/strife/p_spec.c
+++ b/src/strife/p_spec.c
@@ -101,37 +101,42 @@ extern anim_t* lastanim;
// and end entry, in the order found in
// the WAD file.
//
-animdef_t animdefs[] =
+animdef_t animdefs[] =
{
-/* {false, "NUKAGE3", "NUKAGE1", 8},
- {false, "FWATER4", "FWATER1", 8},
- {false, "SWATER4", "SWATER1", 8},
- {false, "LAVA4", "LAVA1", 8},
- {false, "BLOOD3", "BLOOD1", 8},
-
- // DOOM II flat animations.
- {false, "RROCK08", "RROCK05", 8},
- {false, "SLIME04", "SLIME01", 8},
- {false, "SLIME08", "SLIME05", 8},
- {false, "SLIME12", "SLIME09", 8},
-
- {true, "BLODGR4", "BLODGR1", 8},
- {true, "SLADRIP3", "SLADRIP1", 8},
-
- {true, "BLODRIP4", "BLODRIP1", 8},
- {true, "FIREWALL", "FIREWALA", 8},
- {true, "GSTFONT3", "GSTFONT1", 8},
- {true, "FIRELAVA", "FIRELAV3", 8},
- {true, "FIREMAG3", "FIREMAG1", 8},
- {true, "FIREBLU2", "FIREBLU1", 8},
- {true, "ROCKRED3", "ROCKRED1", 8},
-
- {true, "BFALL4", "BFALL1", 8},
- {true, "SFALL4", "SFALL1", 8},
- {true, "WFALL4", "WFALL1", 8},
- {true, "DBRAIN4", "DBRAIN1", 8},*/
-
- {-1, "", "", 0},
+ { false, "F_SCANR8", "F_SCANR5", 4},
+ { false, "F_WATR03", "F_WATR01", 8},
+ { false, "F_PWATR3", "F_PWATR1", 11},
+ { false, "F_SCANR4", "F_SCANR1", 4},
+ { true, "SCAN08", "SCAN05", 4},
+ { true, "SWTRMG03", "SWTRMG01", 4},
+ { true, "SCAN04", "SCAN01", 4},
+ { true, "COMP04", "COMP01", 4},
+ { true, "COMP08", "COMP05", 6},
+ { true, "COMP12", "COMP09", 11},
+ { true, "COMP16", "COMP13", 12},
+ { true, "COMP20", "COMP17", 12},
+ { true, "COMP24", "COMP21", 12},
+ { true, "COMP28", "COMP25", 12},
+ { true, "COMP32", "COMP29", 12},
+ { true, "COMP37", "COMP33", 12},
+ { true, "COMP41", "COMP38", 12},
+ { true, "COMP49", "COMP42", 10},
+ { true, "BRKGRY16", "BRKGRY13", 10},
+ { true, "BRNSCN04", "BRNSCN01", 10},
+ { true, "CONCRT12", "CONCRT09", 11},
+ { true, "CONCRT25", "CONCRT22", 11},
+ { true, "WALPMP02", "WALPMP01", 16},
+ { true, "WALTEK17", "WALTEK16", 8},
+ { true, "FORCE04", "FORCE01", 4},
+ { true, "FORCE08", "FORCE05", 4},
+ { true, "FAN02", "FAN01", 4},
+ { false, "F_VWATR3", "P_VWATR1", 4},
+ { false, "F_HWATR3", "F_HWATR1", 4},
+ { false, "F_TELE2", "F_TELE1", 4},
+ { false, "F_FAN2", "F_FAN1", 4},
+ { false, "F_CONVY2", "F_CONVY1", 4},
+ { false, "F_RDALN4", "F_RDALN1", 4},
+ { -1, NULL, NULL, 0},
};
anim_t anims[MAXANIMS];
diff --git a/src/strife/r_plane.c b/src/strife/r_plane.c
index 752f5d14..fce321f0 100644
--- a/src/strife/r_plane.c
+++ b/src/strife/r_plane.c
@@ -50,7 +50,8 @@ planefunction_t ceilingfunc;
//
// Here comes the obnoxious "visplane".
-#define MAXVISPLANES 128
+// haleyjd 08/29/10: [STRIFE] MAXVISPLANES increased to 200
+#define MAXVISPLANES 200
visplane_t visplanes[MAXVISPLANES];
visplane_t* lastvisplane;
visplane_t* floorplane;