diff --git a/docs/rh-log.txt b/docs/rh-log.txt index 1ba5fdf50..24a4e25bd 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,3 +1,7 @@ +August 16, 2008 (Changes by Graf Zahl) +- Fixed: A_Explode wants the distance parameter as an int, not a fixed_t. +- some minor DECORATE fixes. + August 14, 2008 (Changes by Graf Zahl) - Fixed: The count parameter of A_Jump is a constant, not an expression. - Fixed: A_Jump used a wrong index into the jump address table. diff --git a/src/cmdlib.cpp b/src/cmdlib.cpp index 9731874e4..7da893a8f 100644 --- a/src/cmdlib.cpp +++ b/src/cmdlib.cpp @@ -222,9 +222,9 @@ FString ExtractFileBase (const char *path, bool include_extension) ParseNum / ParseHex ============== */ -int ParseHex (char *hex) +int ParseHex (const char *hex) { - char *str; + const char *str; int num; num = 0; @@ -250,7 +250,7 @@ int ParseHex (char *hex) } -int ParseNum (char *str) +int ParseNum (const char *str) { if (str[0] == '$') return ParseHex (str+1); @@ -262,7 +262,7 @@ int ParseNum (char *str) // [RH] Returns true if the specified string is a valid decimal number -bool IsNum (char *str) +bool IsNum (const char *str) { while (*str) { diff --git a/src/cmdlib.h b/src/cmdlib.h index 4916eee1f..c308092ed 100644 --- a/src/cmdlib.h +++ b/src/cmdlib.h @@ -39,9 +39,9 @@ void DefaultExtension (FString &path, const char *extension); FString ExtractFilePath (const char *path); FString ExtractFileBase (const char *path, bool keep_extension=false); -int ParseHex (char *str); -int ParseNum (char *str); -bool IsNum (char *str); // [RH] added +int ParseHex (const char *str); +int ParseNum (const char *str); +bool IsNum (const char *str); // [RH] added char *copystring(const char *s); void ReplaceString (char **ptr, const char *str); diff --git a/src/g_level.cpp b/src/g_level.cpp index 5d41a6a9a..475c63d61 100644 --- a/src/g_level.cpp +++ b/src/g_level.cpp @@ -764,7 +764,7 @@ static void G_DoParseMapInfo (int lump) case MITL_MAP: // map { char maptemp[8]; - char *mapname; + const char *mapname; levelflags = defaultinfo.flags; sc.MustGetString (); @@ -989,7 +989,7 @@ static void ParseMapInfoLower (FScanner &sc, EndSequence newSeq; bool useseq = false; char maptemp[8]; - char *mapname; + const char *mapname; sc.MustGetString (); mapname = sc.String; diff --git a/src/g_shared/sbarinfo.h b/src/g_shared/sbarinfo.h index 70be21881..7582ab64a 100644 --- a/src/g_shared/sbarinfo.h +++ b/src/g_shared/sbarinfo.h @@ -140,7 +140,7 @@ struct SBarInfo int getSignedInteger(FScanner &sc); //returns a signed integer. int newImage(const char* patchname); void Init(); - EColorRange GetTranslation(FScanner &sc, char* translation); + EColorRange GetTranslation(FScanner &sc, const char* translation); SBarInfo(); SBarInfo(int lumpnum); ~SBarInfo(); diff --git a/src/g_shared/sbarinfo_parser.cpp b/src/g_shared/sbarinfo_parser.cpp index 06e580012..a219dbd5a 100644 --- a/src/g_shared/sbarinfo_parser.cpp +++ b/src/g_shared/sbarinfo_parser.cpp @@ -1344,7 +1344,7 @@ int SBarInfo::newImage(const char *patchname) } //converts a string into a tranlation. -EColorRange SBarInfo::GetTranslation(FScanner &sc, char* translation) +EColorRange SBarInfo::GetTranslation(FScanner &sc, const char* translation) { EColorRange returnVal = CR_UNTRANSLATED; FString namedTranslation; //we must send in "[translation]" diff --git a/src/thingdef/thingdef_codeptr.cpp b/src/thingdef/thingdef_codeptr.cpp index 512306421..76be23ca9 100644 --- a/src/thingdef/thingdef_codeptr.cpp +++ b/src/thingdef/thingdef_codeptr.cpp @@ -565,7 +565,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_Explode) { ACTION_PARAM_START(4); ACTION_PARAM_INT(damage, 0); - ACTION_PARAM_FIXED(distance, 1); + ACTION_PARAM_INT(distance, 1); ACTION_PARAM_BOOL(hurtSource, 2); ACTION_PARAM_BOOL(alert, 3); diff --git a/wadsrc/CMakeLists.txt b/wadsrc/CMakeLists.txt index d3766e8b5..b4c6e211f 100644 --- a/wadsrc/CMakeLists.txt +++ b/wadsrc/CMakeLists.txt @@ -6,8 +6,8 @@ add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/generated/dehsupp.lmp DEPENDS dehsupp ${CMAKE_CURRENT_SOURCE_DIR}/sources/dehsupp.txt ) add_custom_command( OUTPUT ${ZDOOM_OUTPUT_DIR}/zdoom.pk3 - COMMAND ${CMAKE_BINARY_DIR}/tools/zipdir/zipdir ${ZDOOM_OUTPUT_DIR}/zdoom.pk3 ${CMAKE_CURRENT_SOURCE_DIR}/static ${CMAKE_CURRENT_BINARY_DIR}/generated - DEPENDS zipdir ${CMAKE_CURRENT_BINARY_DIR}/generated/dehsupp.lmp ) - + COMMAND ${CMAKE_BINARY_DIR}/tools/zipdir/zipdir ${ZDOOM_OUTPUT_DIR}/zdoom.pk3 ${CMAKE_CURRENT_SOURCE_DIR}/static ${CMAKE_CURRENT_BINARY_DIR}/generated + DEPENDS zipdir ${CMAKE_CURRENT_BINARY_DIR}/generated/dehsupp.lmp ${CMAKE_CURRENT_SOURCE_DIR}/static ) + add_custom_target( pk3 ALL DEPENDS ${ZDOOM_OUTPUT_DIR}/zdoom.pk3 ) diff --git a/wadsrc/static/actors/strife/strifestuff.txt b/wadsrc/static/actors/strife/strifestuff.txt index c4ad31b04..16deecb03 100644 --- a/wadsrc/static/actors/strife/strifestuff.txt +++ b/wadsrc/static/actors/strife/strifestuff.txt @@ -1768,6 +1768,7 @@ ACTOR CeilingTurret 27 Mass 10000000 Monster -SOLID + -CANPASS +AMBUSH +SPAWNCEILING +NOGRAVITY