From ddb7747373ae239fb67996cffd6a7d2bdbb1cf6a Mon Sep 17 00:00:00 2001 From: black Date: Sat, 20 Dec 2003 18:21:18 +0000 Subject: [PATCH] PR_SetString and PRVM_SetString now point to pr_strings - resp. prog->strings if a NULL string is passed. git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3745 d7cf8633-e32d-0410-b094-e92efae38249 --- progs.h | 4 ++-- progsvm.h | 2 +- todo | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/progs.h b/progs.h index 0ee48852..b6fb5d2b 100644 --- a/progs.h +++ b/progs.h @@ -224,8 +224,8 @@ void PR_Execute_ProgsLoaded(void); void ED_PrintEdicts (void); void ED_PrintNum (int ent); -#define PR_GetString(num) (pr_strings + num) -#define PR_SetString(s) ((int) (s - pr_strings)) +#define PR_GetString(num) (pr_strings + num) +#define PR_SetString(s) ((int) (s) ? (s - pr_strings) : 0) #endif diff --git a/progsvm.h b/progsvm.h index eb2215bb..181939d9 100644 --- a/progsvm.h +++ b/progsvm.h @@ -422,7 +422,7 @@ void PRVM_ED_PrintEdicts_f (void); void PRVM_ED_PrintNum (int ent); #define PRVM_GetString(num) (prog->strings + num) -#define PRVM_SetString(s) ((int) (s - prog->strings)) +#define PRVM_SetString(s) ((int) (s) ? (s - prog->strings) : 0) //============================================================================ diff --git a/todo b/todo index 1ab5e93b..253a1f38 100644 --- a/todo +++ b/todo @@ -104,7 +104,7 @@ d darkplaces: fix key based turning being affected by slowmo - it should not be -n darkplaces: make sure EF_FULLBRIGHT works on bmodels (FrikaC) -n darkplaces: make sure EF_FULLBRIGHT works on models (FrikaC) -n darkplaces: make sure EF_FULLBRIGHT works on sprites (FrikaC) -0 darkplaces: make sure PR_SetString points NULL strings at pr_strings (which would be an offset of 0) (Fuh) +-n darkplaces: make sure PR_SetString points NULL strings at pr_strings (which would be an offset of 0) (Fuh) 0 darkplaces: make sure QuakeDoneQuick works (Chris Kemp) 0 darkplaces: make sure r_fullbright works 0 darkplaces: make sure that sky works without a valid size (just treat it as single layer clouds or non-animated) (tell Vermeulen) -- 2.39.2