diff --git a/CHANGELOG.txt b/CHANGELOG.txt index ce4709d81..909ba2df6 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,5 +1,9 @@ D1X-Rebirth Changelog +20090430 +-------- +arch/carbon/conf.h, d1x-rebirth.xcodeproj/project.pbxproj, main/gauges.h, main/multi.h: Disable network support for Mac OS X for now + 20090409 -------- main/multi.c, main/multi.h, main/multibot.c, main/menu.c, main/kmatrix.c, main/net_ipx.c, main/net_ipx.h, main/gameseq.c, main/fuelcen.c, main/ai.c, main/game.c: Abstracting networking protocols - Step 3: Renaming network_* functions to net_ipx_*, writing wrappers for protocol dependend functions in multi.c, Implementing protocol selection and Cleanup - Next up: Implementing new UDP layer diff --git a/arch/carbon/conf.h b/arch/carbon/conf.h index 4ae484a40..962d022d2 100644 --- a/arch/carbon/conf.h +++ b/arch/carbon/conf.h @@ -52,7 +52,7 @@ #if defined(__APPLE__) && defined(__MACH__) # define __unix__ /* Define if you want a network build */ -# define NETWORK +//# define NETWORK //FIXME: TURN BACK ON WHEN ZICO FINISHES!!! #else // Mac OS 9 # ifndef __MWERKS__ # define inline diff --git a/d1x-rebirth.xcodeproj/project.pbxproj b/d1x-rebirth.xcodeproj/project.pbxproj index 6f7a31149..a060f18ba 100755 --- a/d1x-rebirth.xcodeproj/project.pbxproj +++ b/d1x-rebirth.xcodeproj/project.pbxproj @@ -13,10 +13,8 @@ 675ED149066B198A00E42AA7 /* d1x-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 675ED123066B196700E42AA7 /* d1x-Info.plist */; }; 676032E0066B399A008A67A3 /* multi.c in Sources */ = {isa = PBXBuildFile; fileRef = 676032DC066B399A008A67A3 /* multi.c */; }; 676032E1066B399A008A67A3 /* multibot.c in Sources */ = {isa = PBXBuildFile; fileRef = 676032DD066B399A008A67A3 /* multibot.c */; }; - 676032E3066B399A008A67A3 /* network.c in Sources */ = {isa = PBXBuildFile; fileRef = 676032DF066B399A008A67A3 /* network.c */; }; 676032E4066B399A008A67A3 /* multi.c in Sources */ = {isa = PBXBuildFile; fileRef = 676032DC066B399A008A67A3 /* multi.c */; }; 676032E5066B399A008A67A3 /* multibot.c in Sources */ = {isa = PBXBuildFile; fileRef = 676032DD066B399A008A67A3 /* multibot.c */; }; - 676032E7066B399A008A67A3 /* network.c in Sources */ = {isa = PBXBuildFile; fileRef = 676032DF066B399A008A67A3 /* network.c */; }; 676032FA066B39CE008A67A3 /* kmatrix.c in Sources */ = {isa = PBXBuildFile; fileRef = 676032F9066B39CE008A67A3 /* kmatrix.c */; }; 676032FB066B39CE008A67A3 /* kmatrix.c in Sources */ = {isa = PBXBuildFile; fileRef = 676032F9066B39CE008A67A3 /* kmatrix.c */; }; 6766BAC20668B3A000A6052D /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; @@ -273,12 +271,14 @@ EB33198F0D50A70600C799B0 /* snddecom.c in Sources */ = {isa = PBXBuildFile; fileRef = EBEEB2680D2B364300FF39B4 /* snddecom.c */; }; EB3319FD0D5335E600C799B0 /* netdrv_udp.c in Sources */ = {isa = PBXBuildFile; fileRef = EB3319FB0D5335E500C799B0 /* netdrv_udp.c */; }; EB3319FE0D5335E600C799B0 /* netdrv_udp.h in Headers */ = {isa = PBXBuildFile; fileRef = EB3319FC0D5335E600C799B0 /* netdrv_udp.h */; }; - EB3319FF0D5335E600C799B0 /* netdrv_udp.c in Sources */ = {isa = PBXBuildFile; fileRef = EB3319FB0D5335E500C799B0 /* netdrv_udp.c */; }; EB331A000D5335E600C799B0 /* netdrv_udp.h in Headers */ = {isa = PBXBuildFile; fileRef = EB3319FC0D5335E600C799B0 /* netdrv_udp.h */; }; EB331A0C0D53578800C799B0 /* snddecom.c in Sources */ = {isa = PBXBuildFile; fileRef = EBEEB2680D2B364300FF39B4 /* snddecom.c */; }; EB380D7D0E168B1900EBD9AD /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = EB380D7B0E168B1900EBD9AD /* InfoPlist.strings */; }; EB380D7E0E168B1900EBD9AD /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = EB380D7B0E168B1900EBD9AD /* InfoPlist.strings */; }; EB3CA5040E97749400FB1E93 /* tracker_server.c in Sources */ = {isa = PBXBuildFile; fileRef = EB3CA5020E97749400FB1E93 /* tracker_server.c */; }; + EB423CE40F6273F50082C684 /* noloss.h in Headers */ = {isa = PBXBuildFile; fileRef = EB423CE20F6273F50082C684 /* noloss.h */; }; + EB423CE50F6273F50082C684 /* noloss.c in Sources */ = {isa = PBXBuildFile; fileRef = EB423CE10F6273F50082C684 /* noloss.c */; }; + EB423CE60F6273F50082C684 /* noloss.h in Headers */ = {isa = PBXBuildFile; fileRef = EB423CE20F6273F50082C684 /* noloss.h */; }; EB92BE600CDD693C0045A32C /* digi_audio.c in Sources */ = {isa = PBXBuildFile; fileRef = EB92BE5C0CDD693C0045A32C /* digi_audio.c */; }; EB92BE610CDD693C0045A32C /* digi_mixer_music.c in Sources */ = {isa = PBXBuildFile; fileRef = EB92BE5D0CDD693C0045A32C /* digi_mixer_music.c */; }; EB92BE620CDD693C0045A32C /* digi_mixer.c in Sources */ = {isa = PBXBuildFile; fileRef = EB92BE5E0CDD693C0045A32C /* digi_mixer.c */; }; @@ -335,23 +335,12 @@ EBEEB1EF0D2B317800FF39B4 /* custom.h in Headers */ = {isa = PBXBuildFile; fileRef = EBEEB1E50D2B317700FF39B4 /* custom.h */; }; EBEEB1FF0D2B320C00FF39B4 /* hash.c in Sources */ = {isa = PBXBuildFile; fileRef = EBEEB1F30D2B320B00FF39B4 /* hash.c */; }; EBEEB2000D2B320C00FF39B4 /* hash.h in Headers */ = {isa = PBXBuildFile; fileRef = EBEEB1F40D2B320B00FF39B4 /* hash.h */; }; - EBEEB2020D2B320C00FF39B4 /* multipow.c in Sources */ = {isa = PBXBuildFile; fileRef = EBEEB1F60D2B320B00FF39B4 /* multipow.c */; }; - EBEEB2030D2B320C00FF39B4 /* multipow.h in Headers */ = {isa = PBXBuildFile; fileRef = EBEEB1F70D2B320B00FF39B4 /* multipow.h */; }; - EBEEB2050D2B320C00FF39B4 /* netpkt.c in Sources */ = {isa = PBXBuildFile; fileRef = EBEEB1F90D2B320B00FF39B4 /* netpkt.c */; }; - EBEEB2060D2B320C00FF39B4 /* netpkt.h in Headers */ = {isa = PBXBuildFile; fileRef = EBEEB1FA0D2B320B00FF39B4 /* netpkt.h */; }; EBEEB2090D2B320C00FF39B4 /* script.h in Headers */ = {isa = PBXBuildFile; fileRef = EBEEB1FD0D2B320B00FF39B4 /* script.h */; }; EBEEB20B0D2B320C00FF39B4 /* hash.c in Sources */ = {isa = PBXBuildFile; fileRef = EBEEB1F30D2B320B00FF39B4 /* hash.c */; }; EBEEB20C0D2B320C00FF39B4 /* hash.h in Headers */ = {isa = PBXBuildFile; fileRef = EBEEB1F40D2B320B00FF39B4 /* hash.h */; }; - EBEEB20E0D2B320C00FF39B4 /* multipow.c in Sources */ = {isa = PBXBuildFile; fileRef = EBEEB1F60D2B320B00FF39B4 /* multipow.c */; }; - EBEEB20F0D2B320C00FF39B4 /* multipow.h in Headers */ = {isa = PBXBuildFile; fileRef = EBEEB1F70D2B320B00FF39B4 /* multipow.h */; }; - EBEEB2110D2B320C00FF39B4 /* netpkt.c in Sources */ = {isa = PBXBuildFile; fileRef = EBEEB1F90D2B320B00FF39B4 /* netpkt.c */; }; - EBEEB2120D2B320C00FF39B4 /* netpkt.h in Headers */ = {isa = PBXBuildFile; fileRef = EBEEB1FA0D2B320B00FF39B4 /* netpkt.h */; }; EBEEB2150D2B320C00FF39B4 /* script.h in Headers */ = {isa = PBXBuildFile; fileRef = EBEEB1FD0D2B320B00FF39B4 /* script.h */; }; EBEEB29F0D2B378B00FF39B4 /* compare.c in Sources */ = {isa = PBXBuildFile; fileRef = EBEEB29B0D2B378B00FF39B4 /* compare.c */; }; EBEEB2A30D2B378B00FF39B4 /* compare.c in Sources */ = {isa = PBXBuildFile; fileRef = EBEEB29B0D2B378B00FF39B4 /* compare.c */; }; - EBEEB4FB0D2C955F00FF39B4 /* netdrv.c in Sources */ = {isa = PBXBuildFile; fileRef = EBEEB4F90D2C955F00FF39B4 /* netdrv.c */; }; - EBEEB4FD0D2C955F00FF39B4 /* netdrv.c in Sources */ = {isa = PBXBuildFile; fileRef = EBEEB4F90D2C955F00FF39B4 /* netdrv.c */; }; - EBFD39720E3C1B6A00FED206 /* tracker_client.c in Sources */ = {isa = PBXBuildFile; fileRef = EBFD39700E3C1B6A00FED206 /* tracker_client.c */; }; EBFD39730E3C1B6A00FED206 /* tracker_client.c in Sources */ = {isa = PBXBuildFile; fileRef = EBFD39700E3C1B6A00FED206 /* tracker_client.c */; }; /* End PBXBuildFile section */ @@ -363,7 +352,6 @@ 675ED123066B196700E42AA7 /* d1x-Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "d1x-Info.plist"; sourceTree = ""; }; 676032DC066B399A008A67A3 /* multi.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = multi.c; sourceTree = ""; }; 676032DD066B399A008A67A3 /* multibot.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = multibot.c; sourceTree = ""; }; - 676032DF066B399A008A67A3 /* network.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = network.c; sourceTree = ""; }; 676032F9066B39CE008A67A3 /* kmatrix.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = kmatrix.c; sourceTree = ""; }; 676AC04E0668A814007173EB /* gr.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = gr.c; sourceTree = ""; }; 676AC0510668A814007173EB /* ogl.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = ogl.c; sourceTree = ""; }; @@ -527,7 +515,6 @@ EB0420DC0A341042002CC961 /* paging.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = paging.h; sourceTree = ""; }; EB0420DD0A341042002CC961 /* object.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = object.h; sourceTree = ""; }; EB0420DE0A341042002CC961 /* newmenu.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = newmenu.h; sourceTree = ""; }; - EB0420E00A341042002CC961 /* network.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = network.h; sourceTree = ""; }; EB0420E10A341042002CC961 /* digi.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = digi.h; sourceTree = ""; }; EB0420E30A341042002CC961 /* gameseq.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = gameseq.h; sourceTree = ""; }; EB0420E40A341042002CC961 /* desc_id.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = desc_id.h; sourceTree = ""; }; @@ -577,6 +564,8 @@ EB380D7C0E168B1900EBD9AD /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; EB3CA4F90E97740E00FB1E93 /* tracker.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = tracker.h; sourceTree = ""; }; EB3CA5020E97749400FB1E93 /* tracker_server.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = tracker_server.c; sourceTree = ""; }; + EB423CE10F6273F50082C684 /* noloss.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = noloss.c; sourceTree = ""; }; + EB423CE20F6273F50082C684 /* noloss.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = noloss.h; sourceTree = ""; }; EB9181090DABA47B0010CB39 /* console.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = console.h; sourceTree = ""; }; EB92BE5C0CDD693C0045A32C /* digi_audio.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = digi_audio.c; sourceTree = ""; }; EB92BE5D0CDD693C0045A32C /* digi_mixer_music.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = digi_mixer_music.c; sourceTree = ""; }; @@ -693,10 +682,6 @@ EBEEB1E50D2B317700FF39B4 /* custom.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = custom.h; sourceTree = ""; }; EBEEB1F30D2B320B00FF39B4 /* hash.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = hash.c; sourceTree = ""; }; EBEEB1F40D2B320B00FF39B4 /* hash.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = hash.h; sourceTree = ""; }; - EBEEB1F60D2B320B00FF39B4 /* multipow.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = multipow.c; sourceTree = ""; }; - EBEEB1F70D2B320B00FF39B4 /* multipow.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = multipow.h; sourceTree = ""; }; - EBEEB1F90D2B320B00FF39B4 /* netpkt.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = netpkt.c; sourceTree = ""; }; - EBEEB1FA0D2B320B00FF39B4 /* netpkt.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = netpkt.h; sourceTree = ""; }; EBEEB1FD0D2B320B00FF39B4 /* script.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = script.h; sourceTree = ""; }; EBEEB2190D2B34DE00FF39B4 /* alsadigi.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = alsadigi.c; sourceTree = ""; }; EBEEB21A0D2B34DE00FF39B4 /* hmiplay.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = hmiplay.c; sourceTree = ""; }; @@ -720,10 +705,13 @@ EBEEB2680D2B364300FF39B4 /* snddecom.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = snddecom.c; sourceTree = ""; }; EBEEB2690D2B364300FF39B4 /* snddecom.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = snddecom.h; sourceTree = ""; }; EBEEB29B0D2B378B00FF39B4 /* compare.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = compare.c; sourceTree = ""; }; - EBEEB4F90D2C955F00FF39B4 /* netdrv.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = netdrv.c; sourceTree = ""; }; - EBEEB51F0D2C975200FF39B4 /* netdrv_ipx.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = netdrv_ipx.c; sourceTree = ""; }; - EBEEB5200D2C975200FF39B4 /* netdrv_kali.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = netdrv_kali.c; sourceTree = ""; }; - EBEEB7F90D34D4BF00FF39B4 /* netdrv.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = netdrv.h; sourceTree = ""; }; + EBF658940F93684000CB5C73 /* ipx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ipx.c; sourceTree = ""; }; + EBF658950F93684000CB5C73 /* ipx_kali.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ipx_kali.c; sourceTree = ""; }; + EBF658960F93686000CB5C73 /* ipx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ipx.c; sourceTree = ""; }; + EBF658970F9368C100CB5C73 /* ipxdrv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ipxdrv.h; sourceTree = ""; }; + EBF658980F936A8400CB5C73 /* ipxdrv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ipxdrv.c; sourceTree = ""; }; + EBF658990F936A8400CB5C73 /* net_ipx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = net_ipx.c; sourceTree = ""; }; + EBF6589A0F936A8400CB5C73 /* net_ipx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = net_ipx.h; sourceTree = ""; }; EBFD39700E3C1B6A00FED206 /* tracker_client.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = tracker_client.c; sourceTree = ""; }; EBFD39750E3C1C2300FED206 /* tracker.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = tracker.h; sourceTree = ""; }; /* End PBXFileReference section */ @@ -917,8 +905,8 @@ EBEEB21A0D2B34DE00FF39B4 /* hmiplay.c */, EBEEB21B0D2B34DE00FF39B4 /* hmistub.c */, 67603357066B3AE0008A67A3 /* include */, - EBEEB51F0D2C975200FF39B4 /* netdrv_ipx.c */, - EBEEB5200D2C975200FF39B4 /* netdrv_kali.c */, + EBF658940F93684000CB5C73 /* ipx.c */, + EBF658950F93684000CB5C73 /* ipx_kali.c */, EBEEB2220D2B34DE00FF39B4 /* ukali.c */, ); name = linux; @@ -1002,6 +990,7 @@ 67B4471706687CF400DF26D8 /* hostage.c */, 67B4471906687CF400DF26D8 /* hud.c */, 67B4471B06687CF400DF26D8 /* inferno.c */, + EBF658980F936A8400CB5C73 /* ipxdrv.c */, 67B4472006687CF400DF26D8 /* kconfig.c */, 676032F9066B39CE008A67A3 /* kmatrix.c */, 67B4472506687CF400DF26D8 /* laser.c */, @@ -1012,14 +1001,12 @@ 67B4473106687CF400DF26D8 /* morph.c */, 676032DC066B399A008A67A3 /* multi.c */, 676032DD066B399A008A67A3 /* multibot.c */, - EBEEB1F60D2B320B00FF39B4 /* multipow.c */, EBEEB2660D2B364300FF39B4 /* mute.c */, - EBEEB4F90D2C955F00FF39B4 /* netdrv.c */, + EBF658990F936A8400CB5C73 /* net_ipx.c */, EB3319FB0D5335E500C799B0 /* netdrv_udp.c */, - EBEEB1F90D2B320B00FF39B4 /* netpkt.c */, - 676032DF066B399A008A67A3 /* network.c */, 67B4473D06687CF400DF26D8 /* newdemo.c */, 67B4473F06687CF400DF26D8 /* newmenu.c */, + EB423CE10F6273F50082C684 /* noloss.c */, 67B4474106687CF400DF26D8 /* object.c */, 67B4475906687CF400DF26D8 /* paging.c */, 67B4475B06687CF400DF26D8 /* physics.c */, @@ -1083,13 +1070,12 @@ EB0420BB0A341042002CC961 /* morph.h */, EB0420B90A341041002CC961 /* multi.h */, EB0420E70A341042002CC961 /* multibot.h */, - EBEEB1F70D2B320B00FF39B4 /* multipow.h */, EBEEB2670D2B364300FF39B4 /* mute.h */, + EBF6589A0F936A8400CB5C73 /* net_ipx.h */, EB3319FC0D5335E600C799B0 /* netdrv_udp.h */, - EBEEB1FA0D2B320B00FF39B4 /* netpkt.h */, - EB0420E00A341042002CC961 /* network.h */, EB01AFA90A65323200EA4C7C /* newdemo.h */, EB0420DE0A341042002CC961 /* newmenu.h */, + EB423CE20F6273F50082C684 /* noloss.h */, EB0420DD0A341042002CC961 /* object.h */, EB0420DC0A341042002CC961 /* paging.h */, EB0420DB0A341042002CC961 /* physics.h */, @@ -1193,7 +1179,7 @@ EB3319F10D53351600C799B0 /* loadgl.h */, 6791D08F06688A9C00056A5A /* maths.h */, EBEEB2480D2B358D00FF39B4 /* modex.h */, - EBEEB7F90D34D4BF00FF39B4 /* netdrv.h */, + EBF658970F9368C100CB5C73 /* ipxdrv.h */, EBC6525B0890F79B004FCAA3 /* nocfile.h */, EB3319F20D53351600C799B0 /* ogl_init.h */, 6791CF4E0668883900056A5A /* palette.h */, @@ -1354,6 +1340,7 @@ children = ( EBEEB24E0D2B35B000FF39B4 /* hmpfile.c */, EBEEB24F0D2B35B000FF39B4 /* include */, + EBF658960F93686000CB5C73 /* ipx.c */, ); name = win32; path = arch/win32; @@ -1443,10 +1430,9 @@ EBEEB1080D2A307300FF39B4 /* texmapl.h in Headers */, EBEEB1EA0D2B317800FF39B4 /* custom.h in Headers */, EBEEB2000D2B320C00FF39B4 /* hash.h in Headers */, - EBEEB2030D2B320C00FF39B4 /* multipow.h in Headers */, - EBEEB2060D2B320C00FF39B4 /* netpkt.h in Headers */, EBEEB2090D2B320C00FF39B4 /* script.h in Headers */, EB3319FE0D5335E600C799B0 /* netdrv_udp.h in Headers */, + EB423CE60F6273F50082C684 /* noloss.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1488,10 +1474,9 @@ EBEEB1060D2A307300FF39B4 /* texmapl.h in Headers */, EBEEB1EF0D2B317800FF39B4 /* custom.h in Headers */, EBEEB20C0D2B320C00FF39B4 /* hash.h in Headers */, - EBEEB20F0D2B320C00FF39B4 /* multipow.h in Headers */, - EBEEB2120D2B320C00FF39B4 /* netpkt.h in Headers */, EBEEB2150D2B320C00FF39B4 /* script.h in Headers */, EB331A000D5335E600C799B0 /* netdrv_udp.h in Headers */, + EB423CE40F6273F50082C684 /* noloss.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1654,7 +1639,6 @@ 676AC23D0668A938007173EB /* morph.c in Sources */, 676032E4066B399A008A67A3 /* multi.c in Sources */, 676032E5066B399A008A67A3 /* multibot.c in Sources */, - 676032E7066B399A008A67A3 /* network.c in Sources */, 676AC23F0668A938007173EB /* newdemo.c in Sources */, 676AC2400668A938007173EB /* newmenu.c in Sources */, 676AC2410668A938007173EB /* object.c in Sources */, @@ -1697,10 +1681,7 @@ EB92BEA90CDD6A570045A32C /* hmp2mid.c in Sources */, EBEEB1E90D2B317800FF39B4 /* custom.c in Sources */, EBEEB1FF0D2B320C00FF39B4 /* hash.c in Sources */, - EBEEB2020D2B320C00FF39B4 /* multipow.c in Sources */, - EBEEB2050D2B320C00FF39B4 /* netpkt.c in Sources */, EBEEB29F0D2B378B00FF39B4 /* compare.c in Sources */, - EBEEB4FD0D2C955F00FF39B4 /* netdrv.c in Sources */, EBAC98FD0D42497F0017D4BC /* ignorecase.c in Sources */, EBC58E720D489E19007C8ABF /* args.c in Sources */, EB3319FD0D5335E600C799B0 /* netdrv_udp.c in Sources */, @@ -1709,6 +1690,7 @@ EBFD39730E3C1B6A00FED206 /* tracker_client.c in Sources */, EB3CA5040E97749400FB1E93 /* tracker_server.c in Sources */, EB28D99D0ECEABD700E68E9B /* init.c in Sources */, + EB423CE50F6273F50082C684 /* noloss.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1788,7 +1770,6 @@ 676AC2F40668A939007173EB /* morph.c in Sources */, 676032E0066B399A008A67A3 /* multi.c in Sources */, 676032E1066B399A008A67A3 /* multibot.c in Sources */, - 676032E3066B399A008A67A3 /* network.c in Sources */, EBAFC291088E67CD006329AD /* digiobj.c in Sources */, 676AC2F60668A939007173EB /* newdemo.c in Sources */, 676AC2F70668A939007173EB /* newmenu.c in Sources */, @@ -1831,17 +1812,12 @@ EB92BEA70CDD6A570045A32C /* hmp2mid.c in Sources */, EBEEB1EE0D2B317800FF39B4 /* custom.c in Sources */, EBEEB20B0D2B320C00FF39B4 /* hash.c in Sources */, - EBEEB20E0D2B320C00FF39B4 /* multipow.c in Sources */, - EBEEB2110D2B320C00FF39B4 /* netpkt.c in Sources */, EBEEB2A30D2B378B00FF39B4 /* compare.c in Sources */, - EBEEB4FB0D2C955F00FF39B4 /* netdrv.c in Sources */, EBAC98FB0D42497F0017D4BC /* ignorecase.c in Sources */, EBC58E710D489E19007C8ABF /* args.c in Sources */, EB3319850D50A6B200C799B0 /* bmread.c in Sources */, EB33198F0D50A70600C799B0 /* snddecom.c in Sources */, - EB3319FF0D5335E600C799B0 /* netdrv_udp.c in Sources */, EBCE794E0DE59565008D8F82 /* rbaudio.c in Sources */, - EBFD39720E3C1B6A00FED206 /* tracker_client.c in Sources */, EB28D99C0ECEABD700E68E9B /* init.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/main/gauges.h b/main/gauges.h index a14858dc2..afcb1ae0c 100644 --- a/main/gauges.h +++ b/main/gauges.h @@ -47,9 +47,12 @@ extern void check_erase_message(void); // Call to flash a message on the HUD extern void HUD_render_message_frame(); -//extern void HUD_init_message(char * format, ... ); extern void HUD_clear_messages(); +// Call to flash a message on the HUD. Returns true if message drawn. +// (message might not be drawn if previous message was same) +extern int HUD_init_message(char *format, ... ); + //#define gauge_message HUD_init_message diff --git a/main/multi.h b/main/multi.h index a69d9a795..46bedbd50 100644 --- a/main/multi.h +++ b/main/multi.h @@ -21,14 +21,19 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #ifndef _MULTI_H #define _MULTI_H -#ifdef NETWORK - #include "gameseq.h" #include "piggy.h" #include "vers_id.h" #include "powerup.h" #include "newmenu.h" +// Need these for non network builds too -Chris +#define MAX_MESSAGE_LEN 35 +#define SHAREWARE_MAX_MESSAGE_LEN 25 +#define MAX_NUM_NET_PLAYERS 8 // How many simultaneous network players do we support? + +#ifdef NETWORK + #ifdef _WIN32 #include #include @@ -70,10 +75,6 @@ extern int multi_protocol; // set and determinate used protocol // PROTOCOL VARIABLES AND DEFINES - END -#define MAX_MESSAGE_LEN 35 -#define SHAREWARE_MAX_MESSAGE_LEN 25 -#define MAX_NUM_NET_PLAYERS 8 // How many simultaneous network players do we support? - #define MULTI_POSITION 0 #define MULTI_REAPPEAR 1 #define MULTI_FIRE 2 @@ -313,8 +314,6 @@ void change_playernum_to(int new_pnum); extern uint multi_allow_powerup; -extern int HUD_init_message(char * format, ...); - extern struct netgame_info Netgame; /*