From: nhmall Date: Sat, 14 Dec 2019 15:53:12 +0000 (-0500) Subject: Xcode updates X-Git-Tag: NetHack-3.7.0_WIP~140 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2dad98d55ec1337209a233adfd53f116e08f8e3a;p=nethack Xcode updates --- diff --git a/src/bones.c b/src/bones.c index f04c4d932..0d56edd48 100644 --- a/src/bones.c +++ b/src/bones.c @@ -587,7 +587,7 @@ struct obj *corpse; int getbones() { - int ok, i; + int ok; NHFILE *nhfp = (NHFILE *) 0; char c = 0, *bonesid, oldbonesid[40]; /* was [10]; more should be safer */ diff --git a/src/dungeon.c b/src/dungeon.c index 58d52227a..5d34f76b7 100644 --- a/src/dungeon.c +++ b/src/dungeon.c @@ -135,7 +135,7 @@ save_dungeon(nhfp, perform_write, free_data) NHFILE *nhfp; boolean perform_write, free_data; { - int i, count; + int count; branch *curr, *next; mapseen *curr_ms, *next_ms; @@ -2396,7 +2396,7 @@ NHFILE *nhfp; mapseen *mptr; { branch *curr; - int i, brindx; + int brindx; for (brindx = 0, curr = g.branches; curr; curr = curr->next, ++brindx) if (curr == mptr->br) @@ -2426,7 +2426,7 @@ static mapseen * load_mapseen(nhfp) NHFILE *nhfp; { - int i, branchnum = 0, brindx; + int branchnum = 0, brindx; mapseen *load; branch *curr; diff --git a/src/o_init.c b/src/o_init.c index cc63fd7cc..467b9079d 100644 --- a/src/o_init.c +++ b/src/o_init.c @@ -289,7 +289,7 @@ void savenames(nhfp) NHFILE *nhfp; { - int i, j; + int i; unsigned int len; if (perform_bwrite(nhfp)) { @@ -323,7 +323,7 @@ void restnames(nhfp) NHFILE *nhfp; { - int i, j; + int i; unsigned int len = 0; if (nhfp->structlevel) { diff --git a/src/rumors.c b/src/rumors.c index 4b4e7236f..2236de102 100644 --- a/src/rumors.c +++ b/src/rumors.c @@ -386,8 +386,6 @@ void save_oracles(nhfp) NHFILE *nhfp; { - int i; - if (perform_bwrite(nhfp)) { if (nhfp->structlevel) bwrite(nhfp->fd, (genericptr_t) &g.oracle_cnt, sizeof g.oracle_cnt); @@ -409,7 +407,6 @@ void restore_oracles(nhfp) NHFILE *nhfp; { - int i; if (nhfp->structlevel) mread(nhfp->fd, (genericptr_t) &g.oracle_cnt, sizeof g.oracle_cnt); diff --git a/sys/unix/NetHack.xcodeproj/project.pbxproj b/sys/unix/NetHack.xcodeproj/project.pbxproj index ee85f2590..d0658d0a8 100644 --- a/sys/unix/NetHack.xcodeproj/project.pbxproj +++ b/sys/unix/NetHack.xcodeproj/project.pbxproj @@ -147,6 +147,7 @@ 544768AF23994A17004B9739 /* nhlua.c in Sources */ = {isa = PBXBuildFile; fileRef = 544768AD23994A17004B9739 /* nhlua.c */; }; 544768B123994A2C004B9739 /* mdlib.c in Sources */ = {isa = PBXBuildFile; fileRef = 544768B023994A2C004B9739 /* mdlib.c */; }; 544768BA23995BB7004B9739 /* liblua.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 544768B923995BB7004B9739 /* liblua.a */; }; + 544768BC23A53C9F004B9739 /* nhlobj.c in Sources */ = {isa = PBXBuildFile; fileRef = 544768BB23A53C9F004B9739 /* nhlobj.c */; }; 54FCE8292223261F00F393C8 /* isaac64.c in Sources */ = {isa = PBXBuildFile; fileRef = 54FCE8282223261F00F393C8 /* isaac64.c */; }; /* End PBXBuildFile section */ @@ -489,6 +490,7 @@ 544768B423995447004B9739 /* isaac64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = isaac64.h; path = ../../include/isaac64.h; sourceTree = ""; }; 544768B523995488004B9739 /* nhlua.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = nhlua.h; path = ../../include/nhlua.h; sourceTree = ""; }; 544768B923995BB7004B9739 /* liblua.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblua.a; path = ../../lib/lua/liblua.a; sourceTree = ""; }; + 544768BB23A53C9F004B9739 /* nhlobj.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = nhlobj.c; path = ../../src/nhlobj.c; sourceTree = ""; }; 54FCE8282223261F00F393C8 /* isaac64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = isaac64.c; path = ../../src/isaac64.c; sourceTree = ""; }; /* End PBXFileReference section */ @@ -530,6 +532,7 @@ isa = PBXGroup; children = ( 2A953FB221A3F404007906E5 /* XCode.xcconfig */, + 544768BB23A53C9F004B9739 /* nhlobj.c */, 31B8A3F821A23E490055BD01 /* win */, 31B8A3E921A23CC40055BD01 /* sys */, 3189579621A2046700FB2ABE /* include */, @@ -1484,6 +1487,7 @@ 31B8A3C821A238060055BD01 /* options.c in Sources */, 31B8A3CD21A238060055BD01 /* write.c in Sources */, 31B8A40F21A23EEC0055BD01 /* cursmesg.c in Sources */, + 544768BC23A53C9F004B9739 /* nhlobj.c in Sources */, 31B8A3DF21A238060055BD01 /* end.c in Sources */, 31B8A38921A238060055BD01 /* mklev.c in Sources */, 31B8A3D721A238060055BD01 /* muse.c in Sources */,