reHLDS/ReGameDLL_CS
2
0
Fork 0
mirror of https://github.com/s1lentq/ReGameDLL_CS.git synced 2024-12-27 07:05:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some compiler warnings

Browse Source 
Fixed a appversion.sh when the path may contain spaces
This commit is contained in:
s1lent 2020-02-06 19:11:07 +07:00
parent b465002c4d
commit 3f6d9db420
No known key found for this signature in database
GPG Key ID: 0FE401DC73916B5C
6 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
regamedll/CMakeLists.txt
View File

@ -59,7 +59,7 @@ else()
endif() endif()
if (NOT DEBUG AND USE_STATIC_LIBSTDC) if (NOT DEBUG AND USE_STATIC_LIBSTDC)
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-gc-sections -Wl,--version-script=${PROJECT_SOURCE_DIR}/../version_script.lds") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-gc-sections -Wl,--version-script=\"${PROJECT_SOURCE_DIR}/../version_script.lds\"")
endif() endif()
if (USE_STATIC_LIBSTDC) if (USE_STATIC_LIBSTDC)
@ -142,7 +142,7 @@ add_definitions(
add_library(regamedll SHARED ${appversion.sh} ${GAMEDLL_SRCS} ${ENGINE_SRCS} ${SHARED_SRCS}) add_library(regamedll SHARED ${appversion.sh} ${GAMEDLL_SRCS} ${ENGINE_SRCS} ${SHARED_SRCS})
set_property(TARGET regamedll PROPERTY LIBRARY_OUTPUT_NAME cs) set_property(TARGET regamedll PROPERTY LIBRARY_OUTPUT_NAME cs)
add_custom_target(appversion COMMAND ${PROJECT_SOURCE_DIR}/version/appversion.sh ${PROJECT_SOURCE_DIR} regamedll) add_custom_target(appversion DEPENDS COMMAND "${PROJECT_SOURCE_DIR}/version/appversion.sh" "${PROJECT_SOURCE_DIR}")
set_target_properties(regamedll PROPERTIES PREFIX "" COMPILE_FLAGS "-m32" LINK_FLAGS "-m32" POSITION_INDEPENDENT_CODE ON) set_target_properties(regamedll PROPERTIES PREFIX "" COMPILE_FLAGS "-m32" LINK_FLAGS "-m32" POSITION_INDEPENDENT_CODE ON)
target_link_libraries(regamedll dl aelf32) target_link_libraries(regamedll dl aelf32)
add_dependencies(regamedll appversion) add_dependencies(regamedll appversion)

4
regamedll/dlls/client.cpp
View File

@ -3209,7 +3209,7 @@ void EXT_FUNC InternalCommand(edict_t *pEntity, const char *pcmd, const char *pa
{ {
if (pPlayer->pev->deadflag != DEAD_NO && pPlayer->m_autoBuyString[0] != '\0') if (pPlayer->pev->deadflag != DEAD_NO && pPlayer->m_autoBuyString[0] != '\0')
return; return;
pPlayer->ClearAutoBuyData(); pPlayer->ClearAutoBuyData();
for (int i = 1; i < CMD_ARGC_(); i++) for (int i = 1; i < CMD_ARGC_(); i++)
@ -3229,7 +3229,7 @@ void EXT_FUNC InternalCommand(edict_t *pEntity, const char *pcmd, const char *pa
{ {
if (pPlayer->pev->deadflag != DEAD_NO && pPlayer->m_rebuyString) if (pPlayer->pev->deadflag != DEAD_NO && pPlayer->m_rebuyString)
return; return;
if (CMD_ARGC_() == 2) if (CMD_ARGC_() == 2)
{ {
pPlayer->InitRebuyData(parg1); pPlayer->InitRebuyData(parg1);

2
regamedll/dlls/player.cpp
View File

@ -6859,7 +6859,7 @@ void CBasePlayer::SendHostageIcons()
if (hostagesCount > MAX_HOSTAGE_ICON) if (hostagesCount > MAX_HOSTAGE_ICON)
hostagesCount = MAX_HOSTAGE_ICON; hostagesCount = MAX_HOSTAGE_ICON;
char buf[16]; char buf[18];
Q_snprintf(buf, ARRAYSIZE(buf), "hostage%d", hostagesCount); Q_snprintf(buf, ARRAYSIZE(buf), "hostage%d", hostagesCount);
if (hostagesCount) if (hostagesCount)

22
regamedll/dlls/sound.cpp
View File

@ -1044,7 +1044,7 @@ int USENTENCEG_PickSequential(int isentenceg, char *szfound, int ipick, int fres
{ {
char *szgroupname; char *szgroupname;
unsigned char count; unsigned char count;
char sznum[8]; char sznum[12];
if (!fSentencesInit) if (!fSentencesInit)
return -1; return -1;
@ -1063,7 +1063,7 @@ int USENTENCEG_PickSequential(int isentenceg, char *szfound, int ipick, int fres
Q_strcpy(szfound, "!"); Q_strcpy(szfound, "!");
Q_strcat(szfound, szgroupname); Q_strcat(szfound, szgroupname);
Q_sprintf(sznum, "%d", ipick); Q_snprintf(sznum, sizeof(sznum), "%d", ipick);
Q_strcat(szfound, sznum); Q_strcat(szfound, sznum);
if (ipick >= count) if (ipick >= count)
@ -1090,7 +1090,7 @@ int USENTENCEG_Pick(int isentenceg, char *szfound)
unsigned char *plru; unsigned char *plru;
unsigned char i; unsigned char i;
unsigned char count; unsigned char count;
char sznum[8]; char sznum[12];
unsigned char ipick = 0xFF; unsigned char ipick = 0xFF;
BOOL ffound = FALSE; BOOL ffound = FALSE;
@ -1121,7 +1121,7 @@ int USENTENCEG_Pick(int isentenceg, char *szfound)
{ {
Q_strcpy(szfound, "!"); Q_strcpy(szfound, "!");
Q_strcat(szfound, szgroupname); Q_strcat(szfound, szgroupname);
Q_sprintf(sznum, "%d", ipick); Q_snprintf(sznum, sizeof(sznum), "%d", ipick);
Q_strcat(szfound, sznum); Q_strcat(szfound, sznum);
return ipick; return ipick;
@ -1243,7 +1243,7 @@ int SENTENCEG_PlaySequentialSz(edict_t *entity, const char *szgroupname, float v
NOXREF void SENTENCEG_Stop(edict_t *entity, int isentenceg, int ipick) NOXREF void SENTENCEG_Stop(edict_t *entity, int isentenceg, int ipick)
{ {
char buffer[64]; char buffer[64];
char sznum[8]; char sznum[12];
if (!fSentencesInit) if (!fSentencesInit)
return; return;
@ -1251,10 +1251,10 @@ NOXREF void SENTENCEG_Stop(edict_t *entity, int isentenceg, int ipick)
if (isentenceg < 0 || ipick < 0) if (isentenceg < 0 || ipick < 0)
return; return;
Q_strcpy(buffer, "!"); Q_strlcpy(buffer, "!");
Q_strcat(buffer, rgsentenceg[isentenceg].szgroupname); Q_strlcat(buffer, rgsentenceg[isentenceg].szgroupname);
Q_sprintf(sznum, "%d", ipick); Q_snprintf(sznum, sizeof(sznum), "%d", ipick);
Q_strcat(buffer, sznum); Q_strlcat(buffer, sznum);
STOP_SOUND(entity, CHAN_VOICE, buffer); STOP_SOUND(entity, CHAN_VOICE, buffer);
} }
@ -1387,7 +1387,7 @@ void SENTENCEG_Init()
// convert sentence (sample) name to !sentencenum, return !sentencenum // convert sentence (sample) name to !sentencenum, return !sentencenum
int SENTENCEG_Lookup(const char *sample, char *sentencenum) int SENTENCEG_Lookup(const char *sample, char *sentencenum)
{ {
char sznum[8]; char sznum[12];
int i; int i;
// this is a sentence name; lookup sentence number // this is a sentence name; lookup sentence number
@ -1399,7 +1399,7 @@ int SENTENCEG_Lookup(const char *sample, char *sentencenum)
if (sentencenum) if (sentencenum)
{ {
Q_strcpy(sentencenum, "!"); Q_strcpy(sentencenum, "!");
Q_sprintf(sznum, "%d", i); Q_snprintf(sznum, sizeof(sznum), "%d", i);
Q_strcat(sentencenum, sznum); Q_strcat(sentencenum, sznum);
} }

14
regamedll/game_shared/bot/nav_area.cpp
View File

@ -3806,7 +3806,7 @@ void EditNavAreas(NavEditCmdType cmd)
{ {
lastSelectedArea = area; lastSelectedArea = area;
char buffer[80]; char buffer[190];
char attrib[80]; char attrib[80];
char locName[80]; char locName[80];
@ -3829,14 +3829,14 @@ void EditNavAreas(NavEditCmdType cmd)
} }
else else
{ {
Q_sprintf(attrib, "%s%s%s%s", Q_snprintf(attrib, sizeof(attrib), "%s%s%s%s",
(area->GetAttributes() & NAV_CROUCH) ? "CROUCH " : "", (area->GetAttributes() & NAV_CROUCH) ? "CROUCH " : "",
(area->GetAttributes() & NAV_JUMP) ? "JUMP " : "", (area->GetAttributes() & NAV_JUMP) ? "JUMP " : "",
(area->GetAttributes() & NAV_PRECISE) ? "PRECISE " : "", (area->GetAttributes() & NAV_PRECISE) ? "PRECISE " : "",
(area->GetAttributes() & NAV_NO_JUMP) ? "NO_JUMP " : ""); (area->GetAttributes() & NAV_NO_JUMP) ? "NO_JUMP " : "");
} }
Q_sprintf(buffer, "Area #%d %s %s\n", area->GetID(), locName, attrib); Q_snprintf(buffer, sizeof(buffer), "Area #%d %s %s\n", area->GetID(), locName, attrib);
UTIL_SayTextAll(buffer, pLocalPlayer); UTIL_SayTextAll(buffer, pLocalPlayer);
// do "place painting" // do "place painting"
@ -4018,8 +4018,8 @@ void EditNavAreas(NavEditCmdType cmd)
connected += markedArea->GetAdjacentCount(EAST); connected += markedArea->GetAdjacentCount(EAST);
connected += markedArea->GetAdjacentCount(WEST); connected += markedArea->GetAdjacentCount(WEST);
char buffer[80]; char buffer[190];
Q_sprintf(buffer, "Marked Area is connected to %d other Areas\n", connected); Q_snprintf(buffer, sizeof(buffer), "Marked Area is connected to %d other Areas\n", connected);
UTIL_SayTextAll(buffer, pLocalPlayer); UTIL_SayTextAll(buffer, pLocalPlayer);
} }
break; break;
@ -4065,8 +4065,8 @@ void EditNavAreas(NavEditCmdType cmd)
} }
} }
char buffer[80]; char buffer[190];
Q_sprintf(buffer, "Marked Area is connected to %d other Areas - there are %d total unnamed areas\n", connected, totalUnnamedAreas); Q_snprintf(buffer, sizeof(buffer), "Marked Area is connected to %d other Areas - there are %d total unnamed areas\n", connected, totalUnnamedAreas);
UTIL_SayTextAll(buffer, pLocalPlayer); UTIL_SayTextAll(buffer, pLocalPlayer);
} }
} }

76
regamedll/version/appversion.sh
View File

@ -2,19 +2,20 @@
init() init()
{ {
SOURCE_DIR=$1 SOURCE_DIR="$@"
VERSION_FILE=$SOURCE_DIR/../gradle.properties GIT_DIR="$SOURCE_DIR/.."
APPVERSION_FILE=$SOURCE_DIR/version/appversion.h VERSION_FILE="$GIT_DIR/gradle.properties"
APPVERSION_FILE="$SOURCE_DIR/version/appversion.h"
if test -z "`git --version`"; then if test -z "`git --version`"; then
echo "Please install git client" echo "Please install git client"
echo "sudo apt-get install git" echo "sudo apt-get install git"
exit 0 exit -1
fi fi
# Read old version # Read old version
if [ -e $APPVERSION_FILE ]; then if [ -e "$APPVERSION_FILE" ]; then
OLD_VERSION=$(cat $APPVERSION_FILE | grep -wi '#define APP_VERSION' | sed -e 's/#define APP_VERSION[ \t\r\n\v\f]\+\(.*\)/\1/i' -e 's/\r//g') OLD_VERSION=$(cat "$APPVERSION_FILE" | grep -wi '#define APP_VERSION' | sed -e 's/#define APP_VERSION[ \t\r\n\v\f]\+\(.*\)/\1/i' -e 's/\r//g')
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
OLD_VERSION="" OLD_VERSION=""
else else
@ -23,29 +24,28 @@ init()
fi fi
fi fi
# Get major, minor and maintenance information from gradle.properties
# Get major, minor and maintenance information from version.h MAJOR=$(sed -nr -e '/majorVersion/ s/.*\= *//p' "$VERSION_FILE" | tr -d '\n\r')
MAJOR=$(sed -nr -e '/majorVersion/ s/.*\= *//p' $VERSION_FILE | tr -d '\n\r')
if [ $? -ne 0 -o "$MAJOR" = "" ]; then if [ $? -ne 0 -o "$MAJOR" = "" ]; then
MAJOR=0 MAJOR=0
fi fi
MINOR=$(sed -nr -e '/minorVersion/ s/.*\= *//p' $VERSION_FILE | tr -d '\n\r') MINOR=$(sed -nr -e '/minorVersion/ s/.*\= *//p' "$VERSION_FILE" | tr -d '\n\r')
if [ $? -ne 0 -o "$MINOR" = "" ]; then if [ $? -ne 0 -o "$MINOR" = "" ]; then
MINOR=0 MINOR=0
fi fi
MAINTENANCE=$(sed -nr -e '/maintenanceVersion/ s/.*\= *//p' $VERSION_FILE | tr -d '\n\r') MAINTENANCE=$(sed -nr -e '/maintenanceVersion/ s/.*\= *//p' "$VERSION_FILE" | tr -d '\n\r')
if [ $? -ne 0 -o "$MAINTENANCE" = "" ]; then if [ $? -ne 0 -o "$MAINTENANCE" = "" ]; then
MAINTENANCE=0 MAINTENANCE=0
fi fi
BRANCH_NAME=$(git -C $SOURCE_DIR/../ rev-parse --abbrev-ref HEAD) BRANCH_NAME=$(git -C "$GIT_DIR/" rev-parse --abbrev-ref HEAD)
if [ $? -ne 0 -o "$BRANCH_NAME" = "" ]; then if [ $? -ne 0 -o "$BRANCH_NAME" = "" ]; then
BRANCH_NAME=master BRANCH_NAME=master
fi fi
COMMIT_COUNT=$(git -C $SOURCE_DIR/../ rev-list --count $BRANCH_NAME) COMMIT_COUNT=$(git -C "$GIT_DIR/" rev-list --count $BRANCH_NAME)
if [ $? -ne 0 -o "$COMMIT_COUNT" = "" ]; then if [ $? -ne 0 -o "$COMMIT_COUNT" = "" ]; then
COMMIT_COUNT=0 COMMIT_COUNT=0
fi fi
@ -54,17 +54,17 @@ init()
# Configure remote url repository # Configure remote url repository
# #
# Get remote name by current branch # Get remote name by current branch
BRANCH_REMOTE=$(git -C $SOURCE_DIR/../ config branch.$BRANCH_NAME.remote) BRANCH_REMOTE=$(git -C "$GIT_DIR/" config branch.$BRANCH_NAME.remote)
if [ $? -ne 0 -o "$BRANCH_REMOTE" = "" ]; then if [ $? -ne 0 -o "$BRANCH_REMOTE" = "" ]; then
BRANCH_REMOTE=origin BRANCH_REMOTE=origin
fi fi
# Get commit id # Get commit id
COMMIT_SHA=$(git -C $SOURCE_DIR/../ rev-parse --verify HEAD) COMMIT_SHA=$(git -C "$GIT_DIR/" rev-parse --verify HEAD)
COMMIT_SHA=${COMMIT_SHA:0:7} COMMIT_SHA=${COMMIT_SHA:0:7}
# Get remote url # Get remote url
COMMIT_URL=$(git -C $SOURCE_DIR/../ config remote.$BRANCH_REMOTE.url) COMMIT_URL=$(git -C "$GIT_DIR/" config remote.$BRANCH_REMOTE.url)
# Strip prefix 'git@' # Strip prefix 'git@'
COMMIT_URL=${COMMIT_URL#git@} COMMIT_URL=${COMMIT_URL#git@}
@ -85,7 +85,7 @@ init()
# #
# Detect local modifications # Detect local modifications
# #
if [ `git -C $SOURCE_DIR/../ ls-files -m | wc -l` = 0 ]; then if [ `git -C "$GIT_DIR/" ls-files -m | wc -l` = 0 ]; then
MODIFIED= MODIFIED=
else else
MODIFIED=+m MODIFIED=+m
@ -109,29 +109,29 @@ update_appversion()
# Write appversion.h # Write appversion.h
echo Updating appversion.h, new version is '"'$NEW_VERSION'"', the old one was $OLD_VERSION echo Updating appversion.h, new version is '"'$NEW_VERSION'"', the old one was $OLD_VERSION
echo -e "#ifndef __APPVERSION_H__\r">$APPVERSION_FILE echo -e "#ifndef __APPVERSION_H__\r">"$APPVERSION_FILE"
echo -e "#define __APPVERSION_H__\r">>$APPVERSION_FILE echo -e "#define __APPVERSION_H__\r">>"$APPVERSION_FILE"
echo -e "\r">>$APPVERSION_FILE echo -e "\r">>"$APPVERSION_FILE"
echo -e "//\r">>$APPVERSION_FILE echo -e "//\r">>"$APPVERSION_FILE"
echo -e "// This file is generated automatically.\r">>$APPVERSION_FILE echo -e "// This file is generated automatically.\r">>"$APPVERSION_FILE"
echo -e "// Don't edit it.\r">>$APPVERSION_FILE echo -e "// Don't edit it.\r">>"$APPVERSION_FILE"
echo -e "//\r">>$APPVERSION_FILE echo -e "//\r">>"$APPVERSION_FILE"
echo -e "\r">>$APPVERSION_FILE echo -e "\r">>"$APPVERSION_FILE"
echo -e "// Version defines\r">>$APPVERSION_FILE echo -e "// Version defines\r">>"$APPVERSION_FILE"
echo -e '#define APP_VERSION "'$NEW_VERSION'"\r'>>$APPVERSION_FILE echo -e '#define APP_VERSION "'$NEW_VERSION'"\r'>>"$APPVERSION_FILE"
echo -e "#define APP_VERSION_C $MAJOR,$MINOR,$MAINTENANCE,$COMMIT_COUNT\r">>$APPVERSION_FILE echo -e "#define APP_VERSION_C $MAJOR,$MINOR,$MAINTENANCE,$COMMIT_COUNT\r">>"$APPVERSION_FILE"
echo -e '#define APP_VERSION_STRD "'$MAJOR.$MINOR.$MAINTENANCE.$COMMIT_COUNT'"\r'>>$APPVERSION_FILE echo -e '#define APP_VERSION_STRD "'$MAJOR.$MINOR.$MAINTENANCE.$COMMIT_COUNT'"\r'>>"$APPVERSION_FILE"
echo -e "#define APP_VERSION_FLAGS 0x0L\r">>$APPVERSION_FILE echo -e "#define APP_VERSION_FLAGS 0x0L\r">>"$APPVERSION_FILE"
echo -e "\r">>$APPVERSION_FILE echo -e "\r">>"$APPVERSION_FILE"
echo -e '#define APP_COMMIT_DATE "'$month $day $year'"\r'>>$APPVERSION_FILE echo -e '#define APP_COMMIT_DATE "'$month $day $year'"\r'>>"$APPVERSION_FILE"
echo -e '#define APP_COMMIT_TIME "'$hours'"\r'>>$APPVERSION_FILE echo -e '#define APP_COMMIT_TIME "'$hours'"\r'>>"$APPVERSION_FILE"
echo -e "\r">>$APPVERSION_FILE echo -e "\r">>"$APPVERSION_FILE"
echo -e '#define APP_COMMIT_SHA "'$COMMIT_SHA'"\r'>>$APPVERSION_FILE echo -e '#define APP_COMMIT_SHA "'$COMMIT_SHA'"\r'>>"$APPVERSION_FILE"
echo -e '#define APP_COMMIT_URL "'$COMMIT_URL'"\r'>>$APPVERSION_FILE echo -e '#define APP_COMMIT_URL "'$COMMIT_URL'"\r'>>"$APPVERSION_FILE"
echo -e "\r">>$APPVERSION_FILE echo -e "\r">>"$APPVERSION_FILE"
echo -e "#endif //__APPVERSION_H__\r">>$APPVERSION_FILE echo -e "#endif //__APPVERSION_H__\r">>"$APPVERSION_FILE"
} }
# Initialise # Initialise