commit 2f250f769d0762b78f8753c5be028238a7f32d94
Author: Samuel Villareal <svkaiser@gmail.com>
AuthorDate: Mon Aug 30 03:12:25 2010 +0000
Commit: Samuel Villareal <svkaiser@gmail.com>
CommitDate: Mon Aug 30 03:12:25 2010 +0000
+ Change to patch/maptexture data structure
+ Disabling all animdefs and switchdefs for now
+ Setting sky texture to use SKY03 as a placeholder
Subversion-branch: /branches/strife-branch
Subversion-revision: 1977
---
src/strife/g_game.c | 15 ++++++++-------
src/strife/p_spec.c | 4 ++--
src/strife/p_switch.c | 4 ++--
src/strife/r_data.c | 6 +++---
src/strife/r_sky.h | 2 +-
5 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/src/strife/g_game.c b/src/strife/g_game.c
index 5bc4bd9b..fb9c00f6 100644
--- a/src/strife/g_game.c
+++ b/src/strife/g_game.c
@@ -1643,14 +1643,15 @@ G_InitNew
// source release, but this IS the way Vanilla DOS Doom behaves.
// STRIFE-TODO: Strife skies (of which there are but two)
+ // villsa [STRIFE] setting all skies to SKY03 as a placeholder
if (gamemode == commercial)
{
if (gamemap < 12)
- skytexturename = "SKY1";
+ skytexturename = "SKY03";
else if (gamemap < 21)
- skytexturename = "SKY2";
+ skytexturename = "SKY03";
else
- skytexturename = "SKY3";
+ skytexturename = "SKY03";
}
else
{
@@ -1658,16 +1659,16 @@ G_InitNew
{
default:
case 1:
- skytexturename = "SKY1";
+ skytexturename = "SKY03";
break;
case 2:
- skytexturename = "SKY2";
+ skytexturename = "SKY03";
break;
case 3:
- skytexturename = "SKY3";
+ skytexturename = "SKY03";
break;
case 4: // Special Edition sky
- skytexturename = "SKY4";
+ skytexturename = "SKY03";
break;
}
}
diff --git a/src/strife/p_spec.c b/src/strife/p_spec.c
index 46a459ea..6316298e 100644
--- a/src/strife/p_spec.c
+++ b/src/strife/p_spec.c
@@ -103,7 +103,7 @@ extern anim_t* lastanim;
//
animdef_t animdefs[] =
{
- {false, "NUKAGE3", "NUKAGE1", 8},
+/* {false, "NUKAGE3", "NUKAGE1", 8},
{false, "FWATER4", "FWATER1", 8},
{false, "SWATER4", "SWATER1", 8},
{false, "LAVA4", "LAVA1", 8},
@@ -129,7 +129,7 @@ animdef_t animdefs[] =
{true, "BFALL4", "BFALL1", 8},
{true, "SFALL4", "SFALL1", 8},
{true, "WFALL4", "WFALL1", 8},
- {true, "DBRAIN4", "DBRAIN1", 8},
+ {true, "DBRAIN4", "DBRAIN1", 8},*/
{-1, "", "", 0},
};
diff --git a/src/strife/p_switch.c b/src/strife/p_switch.c
index 2dd3af62..6a459423 100644
--- a/src/strife/p_switch.c
+++ b/src/strife/p_switch.c
@@ -51,7 +51,7 @@
switchlist_t alphSwitchList[] =
{
// Doom shareware episode 1 switches
- {"SW1BRCOM", "SW2BRCOM", 1},
+/* {"SW1BRCOM", "SW2BRCOM", 1},
{"SW1BRN1", "SW2BRN1", 1},
{"SW1BRN2", "SW2BRN2", 1},
{"SW1BRNGN", "SW2BRNGN", 1},
@@ -94,7 +94,7 @@ switchlist_t alphSwitchList[] =
{"SW1STON6", "SW2STON6", 3},
{"SW1TEK", "SW2TEK", 3},
{"SW1MARB", "SW2MARB", 3},
- {"SW1SKULL", "SW2SKULL", 3},
+ {"SW1SKULL", "SW2SKULL", 3},*/
{"\0", "\0", 0}
};
diff --git a/src/strife/r_data.c b/src/strife/r_data.c
index b999e916..84872c9f 100644
--- a/src/strife/r_data.c
+++ b/src/strife/r_data.c
@@ -68,8 +68,8 @@ typedef struct
short originx;
short originy;
short patch;
- short stepdir;
- short colormap;
+ //short stepdir; // villsa [STRIFE] removed
+ //short colormap; // villsa [STRIFE] removed
} PACKEDATTR mappatch_t;
@@ -84,7 +84,7 @@ typedef struct
int masked;
short width;
short height;
- int obsolete;
+ //int obsolete; // villsa [STRIFE] removed
short patchcount;
mappatch_t patches[1];
} PACKEDATTR maptexture_t;
diff --git a/src/strife/r_sky.h b/src/strife/r_sky.h
index d436ce66..8cff1349 100644
--- a/src/strife/r_sky.h
+++ b/src/strife/r_sky.h
@@ -31,7 +31,7 @@
// SKY, store the number for name.
-#define SKYFLATNAME "F_SKY1"
+#define SKYFLATNAME "F_SKY001" // villsa [STRIFE]
// The sky map is 256*128*4 maps.
#define ANGLETOSKYSHIFT 22