edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse source
This commit is contained in:
def 2014-03-29 00:24:34 +01:00
parent efa4f8b8d6
commit 6774a92029
8 changed files with 21 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
announcement.txt
View file

@ -1,4 +1 @@
# (c) Shereef Marzouk. See "licence DDRace.txt" and the readme.txt in the root of the distribution for more information. Please visit ddnet.tw to report any bugs.
# This file has the text that is announced every once and a while on the server
Please Visit DDRace.info to report any bugs Thanks
# This File must always have a line break at the end of file

4
bam.lua
View file

@ -304,11 +304,11 @@ function build(settings)
end end
-- build client, server, version server and master server -- build client, server, version server and master server
client_exe = Link(client_settings, "DDRace", game_shared, game_client, client_exe = Link(client_settings, "DDNet", game_shared, game_client,
engine, client, game_editor, zlib, pnglite, wavpack, engine, client, game_editor, zlib, pnglite, wavpack,
client_link_other, client_osxlaunch) client_link_other, client_osxlaunch)
server_exe = Link(server_settings, "DDRace-Server", engine, server, server_exe = Link(server_settings, "DDNet-Server", engine, server,
game_shared, game_server, zlib, server_link_other) game_shared, game_server, zlib, server_link_other)
serverlaunch = {} serverlaunch = {}

0
other/icons/DDRace-Server.icns → other/icons/DDNet-Server.icns
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 113 KiB

After

Width:  |  Height:  |  Size: 113 KiB

0
other/icons/DDRace-Server.ico → other/icons/DDNet-Server.ico
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 113 KiB

After

Width:  |  Height:  |  Size: 113 KiB

26
scripts/make_release.py
View file

@ -7,7 +7,7 @@ if len(sys.argv) != 3:
print(sys.argv[0], "VERSION PLATFORM") print(sys.argv[0], "VERSION PLATFORM")
sys.exit(-1) sys.exit(-1)
name = "DDRace" name = "DDNet"
version = sys.argv[1] version = sys.argv[1]
platform = sys.argv[2] platform = sys.argv[2]
exe_ext = "" exe_ext = ""
@ -75,13 +75,13 @@ if include_data and not use_bundle:
shutil.copy("other/config_directory.bat", package_dir) shutil.copy("other/config_directory.bat", package_dir)
shutil.copy("SDL.dll", package_dir) shutil.copy("SDL.dll", package_dir)
shutil.copy("freetype.dll", package_dir) shutil.copy("freetype.dll", package_dir)
shutil.copy("libmysql.dll", package_dir) #shutil.copy("libmysql.dll", package_dir)
shutil.copy("mysqlcppconn.dll", package_dir) #shutil.copy("mysqlcppconn.dll", package_dir)
if include_exe and not use_bundle: if include_exe and not use_bundle:
shutil.copy(name+exe_ext, package_dir) shutil.copy(name+exe_ext, package_dir)
shutil.copy(name+"-Server"+exe_ext, package_dir) shutil.copy(name+"-Server"+exe_ext, package_dir)
shutil.copy(name+"-Server_sql"+exe_ext, package_dir) #shutil.copy(name+"-Server_sql"+exe_ext, package_dir)
if include_src: if include_src:
for p in ["src", "scripts", "datasrc", "other", "objs"]: for p in ["src", "scripts", "datasrc", "other", "objs"]:
@ -103,12 +103,12 @@ if use_bundle:
os.system("lipo -create -output "+bin+" "+" ".join(to_lipo)) os.system("lipo -create -output "+bin+" "+" ".join(to_lipo))
# create Teeworlds appfolder # create Teeworlds appfolder
clientbundle_content_dir = os.path.join(package_dir, "DDRace.app/Contents") clientbundle_content_dir = os.path.join(package_dir, "DDNet.app/Contents")
clientbundle_bin_dir = os.path.join(clientbundle_content_dir, "MacOS") clientbundle_bin_dir = os.path.join(clientbundle_content_dir, "MacOS")
clientbundle_resource_dir = os.path.join(clientbundle_content_dir, "Resources") clientbundle_resource_dir = os.path.join(clientbundle_content_dir, "Resources")
clientbundle_framework_dir = os.path.join(clientbundle_content_dir, "Frameworks") clientbundle_framework_dir = os.path.join(clientbundle_content_dir, "Frameworks")
binary_path = clientbundle_bin_dir + "/" + name+exe_ext binary_path = clientbundle_bin_dir + "/" + name+exe_ext
os.mkdir(os.path.join(package_dir, "DDRace.app")) os.mkdir(os.path.join(package_dir, "DDNet.app"))
os.mkdir(clientbundle_content_dir) os.mkdir(clientbundle_content_dir)
os.mkdir(clientbundle_bin_dir) os.mkdir(clientbundle_bin_dir)
os.mkdir(clientbundle_resource_dir) os.mkdir(clientbundle_resource_dir)
@ -132,7 +132,7 @@ if use_bundle:
<key>CFBundleDevelopmentRegion</key> <key>CFBundleDevelopmentRegion</key>
<string>English</string> <string>English</string>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>DDRace</string> <string>DDNet</string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>DDNet</string> <string>DDNet</string>
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
@ -149,10 +149,10 @@ if use_bundle:
file(os.path.join(clientbundle_content_dir, "PkgInfo"), "w").write("APPL????") file(os.path.join(clientbundle_content_dir, "PkgInfo"), "w").write("APPL????")
# create Teeworlds Server appfolder # create Teeworlds Server appfolder
serverbundle_content_dir = os.path.join(package_dir, "DDRace-Server.app/Contents") serverbundle_content_dir = os.path.join(package_dir, "DDNet-Server.app/Contents")
serverbundle_bin_dir = os.path.join(serverbundle_content_dir, "MacOS") serverbundle_bin_dir = os.path.join(serverbundle_content_dir, "MacOS")
serverbundle_resource_dir = os.path.join(serverbundle_content_dir, "Resources") serverbundle_resource_dir = os.path.join(serverbundle_content_dir, "Resources")
os.mkdir(os.path.join(package_dir, "DDRace-Server.app")) os.mkdir(os.path.join(package_dir, "DDNet-Server.app"))
os.mkdir(serverbundle_content_dir) os.mkdir(serverbundle_content_dir)
os.mkdir(serverbundle_bin_dir) os.mkdir(serverbundle_bin_dir)
os.mkdir(serverbundle_resource_dir) os.mkdir(serverbundle_resource_dir)
@ -160,7 +160,7 @@ if use_bundle:
os.mkdir(os.path.join(serverbundle_resource_dir, "data/maps")) os.mkdir(os.path.join(serverbundle_resource_dir, "data/maps"))
os.mkdir(os.path.join(serverbundle_resource_dir, "data/mapres")) os.mkdir(os.path.join(serverbundle_resource_dir, "data/mapres"))
copydir("data/maps", serverbundle_resource_dir) copydir("data/maps", serverbundle_resource_dir)
shutil.copy("other/icons/DDRace-Server.icns", serverbundle_resource_dir) shutil.copy("other/icons/DDNet-Server.icns", serverbundle_resource_dir)
shutil.copy(name+"-Server"+exe_ext, serverbundle_bin_dir) shutil.copy(name+"-Server"+exe_ext, serverbundle_bin_dir)
shutil.copy("serverlaunch"+exe_ext, serverbundle_bin_dir + "/"+name+"_server") shutil.copy("serverlaunch"+exe_ext, serverbundle_bin_dir + "/"+name+"_server")
file(os.path.join(serverbundle_content_dir, "Info.plist"), "w").write(""" file(os.path.join(serverbundle_content_dir, "Info.plist"), "w").write("""
@ -171,9 +171,9 @@ if use_bundle:
<key>CFBundleDevelopmentRegion</key> <key>CFBundleDevelopmentRegion</key>
<string>English</string> <string>English</string>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>DDRace_server</string> <string>DDNet_server</string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>DDRace-Server</string> <string>DDNet-Server</string>
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
@ -205,7 +205,7 @@ if use_gz:
if use_dmg: if use_dmg:
print("making disk image") print("making disk image")
os.system("rm -f %s.dmg %s_temp.dmg" % (package, package)) os.system("rm -f %s.dmg %s_temp.dmg" % (package, package))
os.system("hdiutil create -srcfolder %s -volname DDRace -quiet %s_temp" % (package_dir, package)) os.system("hdiutil create -srcfolder %s -volname DDNet -quiet %s_temp" % (package_dir, package))
os.system("hdiutil convert %s_temp.dmg -format UDBZ -o %s.dmg -quiet" % (package, package)) os.system("hdiutil convert %s_temp.dmg -format UDBZ -o %s.dmg -quiet" % (package, package))
os.system("rm -f %s_temp.dmg" % package) os.system("rm -f %s_temp.dmg" % package)

2
src/game/collision.cpp
View file

@ -981,7 +981,7 @@ int CCollision::Entity(int x, int y, int Layer)
default: default:
str_format(aBuf,sizeof(aBuf), "Unknown"); str_format(aBuf,sizeof(aBuf), "Unknown");
} }
dbg_msg("CCollision::Entity","Something is VERY wrong with the %s layer please report this at http://DDRace.info, you will need to post the map as well and aNy steps that u think may have led to this, Please Also Read the News Section every once and a while", aBuf); dbg_msg("CCollision::Entity","Something is VERY wrong with the %s layer please report this at http://ddnet.tw, you will need to post the map as well and any steps that u think may have led to this", aBuf);
return 0; return 0;
} }
switch (Layer) switch (Layer)

4
src/osxlaunch/server.m
View file

@ -83,7 +83,7 @@ void runServer()
backing: NSBackingStoreBuffered backing: NSBackingStoreBuffered
defer: NO]; defer: NO];
[window setTitle: @"DDRace Server"]; [window setTitle: @"DDNet Server"];
view = [[[ServerView alloc] initWithFrame: graphicsRect] autorelease]; view = [[[ServerView alloc] initWithFrame: graphicsRect] autorelease];
[view setEditable: NO]; [view setEditable: NO];
@ -94,7 +94,7 @@ void runServer()
[window makeKeyAndOrderFront: nil]; [window makeKeyAndOrderFront: nil];
[view listenTo: task]; [view listenTo: task];
[task setLaunchPath: [mainBundle pathForAuxiliaryExecutable: @"DDRace-Server"]]; [task setLaunchPath: [mainBundle pathForAuxiliaryExecutable: @"DDNet-Server"]];
[task setArguments: arguments]; [task setArguments: arguments];
[task launch]; [task launch];
[NSApp run]; [NSApp run];

4
src/osxlaunch/server_mysql.m
View file

@ -83,7 +83,7 @@ void runServer()
backing: NSBackingStoreBuffered backing: NSBackingStoreBuffered
defer: NO]; defer: NO];
[window setTitle: @"DDRace Server"]; [window setTitle: @"DDNet Server"];
view = [[[ServerView alloc] initWithFrame: graphicsRect] autorelease]; view = [[[ServerView alloc] initWithFrame: graphicsRect] autorelease];
[view setEditable: NO]; [view setEditable: NO];
@ -94,7 +94,7 @@ void runServer()
[window makeKeyAndOrderFront: nil]; [window makeKeyAndOrderFront: nil];
[view listenTo: task]; [view listenTo: task];
[task setLaunchPath: [mainBundle pathForAuxiliaryExecutable: @"DDRace-Server_sql"]]; [task setLaunchPath: [mainBundle pathForAuxiliaryExecutable: @"DDNet-Server_sql"]];
[task setArguments: arguments]; [task setArguments: arguments];
[task launch]; [task launch];
[NSApp run]; [NSApp run];