summaryrefslogtreecommitdiff
path: root/src/strife/st_lib.h
diff options
context:
space:
mode:
authorJames Haley2010-09-02 04:49:09 +0000
committerJames Haley2010-09-02 04:49:09 +0000
commit34aa87405686a3ef556ba0be677bd359e2151477 (patch)
tree0844d04f75316893c45457d5d7e747da4c422174 /src/strife/st_lib.h
parent1adc64d1acdab31b610a2482abb983697b20f54e (diff)
downloadchocolate-doom-34aa87405686a3ef556ba0be677bd359e2151477.tar.gz
chocolate-doom-34aa87405686a3ef556ba0be677bd359e2151477.tar.bz2
chocolate-doom-34aa87405686a3ef556ba0be677bd359e2151477.zip
Tweaks to Kaiser's PIT_CheckThing work: moved up thing == tmthing check,
verified clipping and missile stuff, added MF_SPECTRAL check for missiles, and changed missile damage formula to match binary. Major status bar work: STlib rewritten, health and ammo widgets appear on bar. Most DOOM cruft removed. Subversion-branch: /branches/strife-branch Subversion-revision: 1998
Diffstat (limited to 'src/strife/st_lib.h')
-rw-r--r--src/strife/st_lib.h46
1 files changed, 29 insertions, 17 deletions
diff --git a/src/strife/st_lib.h b/src/strife/st_lib.h
index 344fd952..2576233d 100644
--- a/src/strife/st_lib.h
+++ b/src/strife/st_lib.h
@@ -41,24 +41,23 @@ typedef struct
{
// upper right-hand corner
// of the number (right-justified)
- int x;
- int y;
+ int x;
+ int y;
// max # of digits in number
- int width;
+ int width;
- // last number value
- int oldnum;
+ // haleyjd 09/01/10: [STRIFE] Removed "oldnum" member
+ //int oldnum;
// pointer to current value
- int* num;
+ int* num;
- // pointer to boolean stating
- // whether to update number
- boolean* on;
+ // haleyjd 09/01/10: [STRIFE] Removed "on" member
+ // boolean* on;
// list of patches for 0-9
- patch_t** p;
+ patch_t** p;
// user data
int data;
@@ -148,16 +147,28 @@ void STlib_init(void);
// Number widget routines
+
+// haleyjd 09/01/10: [STRIFE] Removed "on" parameter.
void
STlib_initNum
-( st_number_t* n,
- int x,
- int y,
- patch_t** pl,
- int* num,
- boolean* on,
- int width );
+( st_number_t* n,
+ int x,
+ int y,
+ patch_t** pl,
+ int* num,
+ int width );
+
+// haleyjd 09/01/10: [STRIFE] Made globally visible.
+void
+STlib_drawNum
+( st_number_t* n);
+
+// haleyjd 09/01/10: [STRIFE] New function
+void
+STlib_drawNumPositive
+( st_number_t* n);
+/* haleyjd 09/01/10: [STRIFE] All the below were removed
void
STlib_updateNum
( st_number_t* n,
@@ -213,5 +224,6 @@ void
STlib_updateBinIcon
( st_binicon_t* bi,
boolean refresh );
+*/
#endif