Browse Source

Merge pull request #325 from FWGS/sohl1.2-fixes

Fix SoHL 1.2 to compile
sohl1.2
nekonomicon 2 years ago committed by GitHub
parent
commit
bb3cc9f30c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      cl_dll/wscript
  2. 2
      dlls/buttons.cpp
  3. 3
      dlls/wscript

3
cl_dll/wscript

@ -75,6 +75,9 @@ def build(bld):
'message.cpp', 'message.cpp',
'overview.cpp', 'overview.cpp',
'parsemsg.cpp', 'parsemsg.cpp',
'particlemgr.cpp',
'particlemsg.cpp',
'particlesys.cpp',
'saytext.cpp', 'saytext.cpp',
'scoreboard.cpp', 'scoreboard.cpp',
'status_icons.cpp', 'status_icons.cpp',

2
dlls/buttons.cpp

@ -310,9 +310,11 @@ void CEnvState::Think( void )
{ {
ALERT(at_console,"DEBUG: env_state \"%s\" turned itself off",STRING(pev->targetname)); ALERT(at_console,"DEBUG: env_state \"%s\" turned itself off",STRING(pev->targetname));
if (pev->target) if (pev->target)
{
ALERT(at_console,": firing %s",STRING(pev->target)); ALERT(at_console,": firing %s",STRING(pev->target));
if (pev->noise2) if (pev->noise2)
ALERT(at_console," and %s",STRING(pev->noise2)); ALERT(at_console," and %s",STRING(pev->noise2));
}
else if (pev->noise2) else if (pev->noise2)
ALERT(at_console,": firing %s",STRING(pev->noise2)); ALERT(at_console,": firing %s",STRING(pev->noise2));
ALERT(at_console,".\n"); ALERT(at_console,".\n");

3
dlls/wscript

@ -29,6 +29,7 @@ def build(bld):
'agrunt.cpp', 'agrunt.cpp',
'airtank.cpp', 'airtank.cpp',
'aflock.cpp', 'aflock.cpp',
'alias.cpp',
'animating.cpp', 'animating.cpp',
'animation.cpp', 'animation.cpp',
'apache.cpp', 'apache.cpp',
@ -80,11 +81,13 @@ def build(bld):
'items.cpp', 'items.cpp',
'leech.cpp', 'leech.cpp',
'lights.cpp', 'lights.cpp',
'locus.cpp',
'maprules.cpp', 'maprules.cpp',
'monstermaker.cpp', 'monstermaker.cpp',
'monsters.cpp', 'monsters.cpp',
'monsterstate.cpp', 'monsterstate.cpp',
'mortar.cpp', 'mortar.cpp',
'movewith.cpp',
'mp5.cpp', 'mp5.cpp',
'multiplay_gamerules.cpp', 'multiplay_gamerules.cpp',
'nihilanth.cpp', 'nihilanth.cpp',

Loading…
Cancel
Save