mirror of
https://github.com/1dot13/source.git
synced 2026-08-12 14:10:23 +02:00
Replace a ton of trivial #ifdefs with runtime checks
This one is big, but unless I missed something, should be all be
trivial.
scripted-diff with the following, then manually tweaked whatever needed:
```
if [ $# -ne 3 ]; then
echo "Usage: $0 '<pattern>' '<replacement>' '<filename>'"
exit 1
fi
pattern="$1"
replacement="$2"
filename="$3"
if [ ! -f "$filename" ]; then
echo "Error: File $filename does not exist."
exit 1
fi
sed -i '/'"$pattern"'/ {
:loop
$ !{
N
/'"$pattern"'.*\n.*#endif/ {
s/'"$pattern"'/'"$replacement"'/
s/#else/} else {/
s/#endif/}/
P
D
}
/'"$pattern"'/ b loop
}
}' "$filename"
echo "Replacement complete in $filename"
```
h/t to Grok2 for the sed command
This commit is contained in:
@@ -49,6 +49,7 @@
|
||||
#include "Encrypted File.h"
|
||||
#include "InterfaceItemImages.h"
|
||||
#include <sstream>
|
||||
#include <language.hpp>
|
||||
|
||||
//
|
||||
//****** Defines ******
|
||||
@@ -5461,20 +5462,20 @@ void DisplayPopUpBoxExplainingMercArrivalLocationAndTime( )
|
||||
//create the string to display to the user, looks like....
|
||||
// L"%s should arrive at the designated drop-off point ( sector %d:%d %s ) on day %d, at approximately %s.", //first %s is mercs name, next is the sector location and name where they will be arriving in, lastely is the day an the time of arrival
|
||||
|
||||
#ifdef GERMAN
|
||||
if( g_lang == i18n::Lang::de ) {
|
||||
//Germans version has a different argument order
|
||||
swprintf( szLocAndTime, pMessageStrings[ MSG_JUST_HIRED_MERC_ARRIVAL_LOCATION_POPUP ],
|
||||
gMercProfiles[ pSoldier->ubProfile ].zNickname,
|
||||
LaptopSaveInfo.sLastHiredMerc.uiArrivalTime / 1440,
|
||||
zTimeString,
|
||||
zSectorIDString );
|
||||
#else
|
||||
} else {
|
||||
swprintf( szLocAndTime, pMessageStrings[ MSG_JUST_HIRED_MERC_ARRIVAL_LOCATION_POPUP ],
|
||||
gMercProfiles[ pSoldier->ubProfile ].zNickname,
|
||||
zSectorIDString,
|
||||
LaptopSaveInfo.sLastHiredMerc.uiArrivalTime / 1440,
|
||||
zTimeString );
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user