dhewm/dhewm3
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3.git synced 2024-11-26 22:31:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix compilation of demo binaries

Browse source 
invalid conversion from ‘const char*’ to ‘char*’

There are no demo pk4 files available compatible to this 1.3.1
codebase. Add a note about it.
This commit is contained in:
dhewg 2011-12-15 21:27:25 +01:00
parent bc3b1c0883
commit 506569529a
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
neo/CMakeLists.txt
View file

@ -10,11 +10,11 @@ cmake_minimum_required(VERSION 2.6)
# maybe add these as options:
# BUILD_GAMEPAK
# TARGET_MONO
# TARGET_DEMO -DID_DEMO_BUILD
# SETUP
# SDK -D_D3SDK
# don't add these as options, but document them?
# TARGET_DEMO there are no demo pk4s compatible to this 1.3.1 codebase
# IDNET_HOST -DIDNET_HOST=\\"%s\\"' % IDNET_HOST
# DEBUG_MEMORY -DID_DEBUG_MEMORY', '-DID_REDIRECT_NEWDELETE
# LIBC_MALLOC -DUSE_LIBC_MALLOC=0

6
neo/framework/FileSystem.cpp
View file

@ -850,7 +850,7 @@ search paths.
*/
const char *idFileSystemLocal::OSPathToRelativePath( const char *OSPath ) {
static char relativePath[MAX_STRING_CHARS];
char *s, *base;
const char *s, *base;
// skip a drive letter?
@ -871,7 +871,7 @@ const char *idFileSystemLocal::OSPathToRelativePath( const char *OSPath ) {
}
#else
// look for the first complete directory name
base = (char *)strstr( OSPath, BASE_GAMEDIR );
base = strstr( OSPath, BASE_GAMEDIR );
while ( base ) {
char c1 = '\0', c2;
if ( base > OSPath ) {
@ -895,7 +895,7 @@ const char *idFileSystemLocal::OSPathToRelativePath( const char *OSPath ) {
fsgame = fs_game_base.GetString();
}
if ( base == NULL && fsgame && strlen( fsgame ) ) {
base = (char *)strstr( OSPath, fsgame );
base = strstr( OSPath, fsgame );
while ( base ) {
char c1 = '\0', c2;
if ( base > OSPath ) {