mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-19 06:31:26 +02:00
Code Issues Projects Releases Wiki Activity

Hotfix: fix compiling

Browse Source 
Also an attempt to fix my git problems
This commit is contained in:
jacob1
2013-12-18 13:56:27 -05:00
parent f527782405
commit 7e6a51cdfa
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
SConscript
View File

@@ -185,14 +185,14 @@ if not GetOption("macosx"):
raise SystemExit(1) raise SystemExit(1)
else: else:
env.Append(CPPPATH=[GetOption("lua-dir")]) env.Append(CPPPATH=[GetOption("lua-dir")])
else: try:
try: env.ParseConfig('pkg-config --cflags lua5.1')
env.ParseConfig('pkg-config --cflags lua5.1') env.ParseConfig('pkg-config --libs lua5.1')
except: except:
#Check for Lua lib #Check for Lua lib
if not conf.CheckLib('lua5.1') and not conf.CheckLib('lua-5.1') and not conf.CheckLib('lua51') and not conf.CheckLib('lua'): if not conf.CheckLib('lua5.1') and not conf.CheckLib('lua-5.1') and not conf.CheckLib('lua51') and not conf.CheckLib('lua'):
print "liblua5.1 not found or not installed" print "liblua5.1 not found or not installed"
raise SystemExit(1) raise SystemExit(1)
# if fft is enabled try to parse its config, fail otherwise. # if fft is enabled try to parse its config, fail otherwise.

2
src/simulation/elements/WIFI.cpp
View File

@@ -73,7 +73,7 @@ int Element_WIFI::update(UPDATE_FUNC_ARGS)
} }
else else
{ {
if ((r&0xFF)==PT_SPRK && parts[r>>8].ctype!=PT_NSCN && parts[r>>8].life>=3) if ((r&0xFF)==PT_SPRK && parts[r>>8].ctype!=PT_NSCN && parts[r>>8].life==3)
{ {
sim->wireless[parts[i].tmp][1] = 1; sim->wireless[parts[i].tmp][1] = 1;
sim->ISWIRE = 2; sim->ISWIRE = 2;