[teeworlds] 03/05: Imported Upstream version 0.6.3+dfsg
Felix Geyer
fgeyer at moszumanska.debian.org
Mon Apr 25 17:20:38 UTC 2016
This is an automated email from the git hooks/post-receive script.
fgeyer pushed a commit to branch master
in repository teeworlds.
commit d6eebbe38c9bb75fea7ce2a392f351e6ef17a810
Author: Felix Geyer <fgeyer at debian.org>
Date: Mon Apr 25 19:12:01 2016 +0200
Imported Upstream version 0.6.3+dfsg
---
.gitignore | 22 -----
docs/conf/Data/ClassHierarchy.nd | Bin 774 -> 0 bytes
docs/conf/Data/ConfigFileInfo.nd | Bin 26 -> 0 bytes
docs/conf/Data/FileInfo.nd | 180 ----------------------------------
docs/conf/Data/ImageFileInfo.nd | Bin 8 -> 0 bytes
docs/conf/Data/ImageReferenceTable.nd | Bin 8 -> 0 bytes
docs/conf/Data/IndexInfo.nd | Bin 226 -> 0 bytes
docs/conf/Data/PreviousMenuState.nd | Bin 1462 -> 0 bytes
docs/conf/Data/PreviousSettings.nd | Bin 154 -> 0 bytes
docs/conf/Data/SymbolTable.nd | Bin 41681 -> 0 bytes
docs/conf/Languages.txt | 113 ---------------------
docs/conf/Menu.txt | 113 ---------------------
docs/conf/Topics.txt | 81 ---------------
scripts/make_release.py | 2 +-
src/engine/server/server.cpp | 4 +-
src/engine/shared/console.h | 7 +-
src/engine/shared/masterserver.cpp | 2 +-
src/game/editor/editor.cpp | 5 +
src/game/editor/io.cpp | 3 +
src/game/version.h | 2 +-
20 files changed, 16 insertions(+), 518 deletions(-)
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index edbb7ea..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,22 +0,0 @@
-bam
-.bam
-config.lua
-datasrc/__pycache__
-datasrc/*.pyc
-objs
-src/game/generated
-SDL.dll
-freetype.dll
-autoexec.cfg
-
-crapnet*
-dilate*
-fake_server*
-map_resave*
-map_version*
-mastersrv*
-packetgen*
-teeworlds*
-teeworlds_srv*
-tileset_border*
-versionsrv*
diff --git a/docs/conf/Data/ClassHierarchy.nd b/docs/conf/Data/ClassHierarchy.nd
deleted file mode 100644
index c1a7123..0000000
Binary files a/docs/conf/Data/ClassHierarchy.nd and /dev/null differ
diff --git a/docs/conf/Data/ConfigFileInfo.nd b/docs/conf/Data/ConfigFileInfo.nd
deleted file mode 100644
index c32f295..0000000
Binary files a/docs/conf/Data/ConfigFileInfo.nd and /dev/null differ
diff --git a/docs/conf/Data/FileInfo.nd b/docs/conf/Data/FileInfo.nd
deleted file mode 100644
index cc241e7..0000000
--- a/docs/conf/Data/FileInfo.nd
+++ /dev/null
@@ -1,180 +0,0 @@
-1.4
-C/C++
-/home/kma/code/teeworlds/trunk/src/engine/e_huffman.h 1222170110 1 /home/kma/code/teeworlds/trunk/src/engine/e_huffman.h
-/home/kma/code/teeworlds/trunk/src/game/generated/gs_data.hpp 1222683446 0 /home/kma/code/teeworlds/trunk/src/game/generated/gs_data.hpp
-/home/kma/code/teeworlds/trunk/src/game/client/ui.hpp 1220136086 0 /home/kma/code/teeworlds/trunk/src/game/client/ui.hpp
-/home/kma/code/teeworlds/trunk/src/engine/client/ec_srvbrowse.c 1222683496 0 /home/kma/code/teeworlds/trunk/src/engine/client/ec_srvbrowse.c
-/home/kma/code/teeworlds/trunk/src/game/editor/ed_editor.hpp 1220477125 0 /home/kma/code/teeworlds/trunk/src/game/editor/ed_editor.hpp
-/home/kma/code/teeworlds/trunk/src/engine/e_compression.c 1218717193 0 /home/kma/code/teeworlds/trunk/src/engine/e_compression.c
-/home/kma/code/teeworlds/trunk/src/game/client/components/effects.hpp 1219856603 0 /home/kma/code/teeworlds/trunk/src/game/client/components/effects.hpp
-/home/kma/code/teeworlds/trunk/src/game/editor/array.hpp 1213274598 0 /home/kma/code/teeworlds/trunk/src/game/editor/array.hpp
-/home/kma/code/teeworlds/trunk/src/engine/e_if_msg.h 1209633421 1 Messaging
-/home/kma/code/teeworlds/trunk/src/game/server/gamemodes/dm.cpp 1220222024 0 /home/kma/code/teeworlds/trunk/src/game/server/gamemodes/dm.cpp
-/home/kma/code/teeworlds/trunk/src/game/server/gamecontext.cpp 1222365211 0 /home/kma/code/teeworlds/trunk/src/game/server/gamecontext.cpp
-/home/kma/code/teeworlds/trunk/src/game/client/components/hud.hpp 1222354048 0 /home/kma/code/teeworlds/trunk/src/game/client/components/hud.hpp
-/home/kma/code/teeworlds/trunk/src/engine/e_packer.h 1209633421 0 /home/kma/code/teeworlds/trunk/src/engine/e_packer.h
-/home/kma/code/teeworlds/trunk/src/game/client/components/items.cpp 1220136174 0 /home/kma/code/teeworlds/trunk/src/game/client/components/items.cpp
-/home/kma/code/teeworlds/trunk/src/game/client/components/camera.hpp 1219845973 0 /home/kma/code/teeworlds/trunk/src/game/client/components/camera.hpp
-/home/kma/code/teeworlds/trunk/src/game/editor/ed_io.cpp 1212341007 0 /home/kma/code/teeworlds/trunk/src/game/editor/ed_io.cpp
-/home/kma/code/teeworlds/trunk/src/engine/client/ec_font.h 1209633421 0 /home/kma/code/teeworlds/trunk/src/engine/client/ec_font.h
-/home/kma/code/teeworlds/trunk/src/engine/e_msg.c 1212964729 0 /home/kma/code/teeworlds/trunk/src/engine/e_msg.c
-/home/kma/code/teeworlds/trunk/src/game/client/components/menus_ingame.cpp 1222692848 0 /home/kma/code/teeworlds/trunk/src/game/client/components/menus_ingame.cpp
-/home/kma/code/teeworlds/trunk/src/engine/e_compression.h 1209633421 0 /home/kma/code/teeworlds/trunk/src/engine/e_compression.h
-/home/kma/code/teeworlds/trunk/src/game/client/components/flow.cpp 1219782150 0 /home/kma/code/teeworlds/trunk/src/game/client/components/flow.cpp
-/home/kma/code/teeworlds/trunk/src/engine/e_engine.h 1220813504 0 /home/kma/code/teeworlds/trunk/src/engine/e_engine.h
-/home/kma/code/teeworlds/trunk/src/game/generated/gc_data.cpp 1222683449 0 /home/kma/code/teeworlds/trunk/src/game/generated/gc_data.cpp
-/home/kma/code/teeworlds/trunk/src/engine/docs/client_time.txt 1209633420 1 Time on the client
-/home/kma/code/teeworlds/trunk/src/game/client/animstate.cpp 1219785741 0 /home/kma/code/teeworlds/trunk/src/game/client/animstate.cpp
-/home/kma/code/teeworlds/trunk/src/game/client/components/damageind.hpp 1219841173 0 /home/kma/code/teeworlds/trunk/src/game/client/components/damageind.hpp
-/home/kma/code/teeworlds/trunk/src/game/server/entities/laser.hpp 1218740976 0 /home/kma/code/teeworlds/trunk/src/game/server/entities/laser.hpp
-/home/kma/code/teeworlds/trunk/src/game/client/components/nameplates.hpp 1220569205 0 /home/kma/code/teeworlds/trunk/src/game/client/components/nameplates.hpp
-/home/kma/code/teeworlds/trunk/src/game/server/gamemodes/tdm.cpp 1220222010 0 /home/kma/code/teeworlds/trunk/src/game/server/gamemodes/tdm.cpp
-/home/kma/code/teeworlds/trunk/src/game/client/components/broadcast.hpp 1219841173 0 /home/kma/code/teeworlds/trunk/src/game/client/components/broadcast.hpp
-/home/kma/code/teeworlds/trunk/src/engine/e_if_snd.h 1221327616 1 Sound
-/home/kma/code/teeworlds/trunk/src/game/client/components/menus.cpp 1222640846 0 /home/kma/code/teeworlds/trunk/src/game/client/components/menus.cpp
-/home/kma/code/teeworlds/trunk/src/game/server/gamemodes/ctf.hpp 1219777811 0 /home/kma/code/teeworlds/trunk/src/game/server/gamemodes/ctf.hpp
-/home/kma/code/teeworlds/trunk/src/game/generated/gs_data.cpp 1222683446 0 /home/kma/code/teeworlds/trunk/src/game/generated/gs_data.cpp
-/home/kma/code/teeworlds/trunk/src/game/client/components/motd.hpp 1220137292 0 /home/kma/code/teeworlds/trunk/src/game/client/components/motd.hpp
-/home/kma/code/teeworlds/trunk/src/engine/e_if_other.h 1222181143 1 Engine Interface
-/home/kma/code/teeworlds/trunk/src/game/editor/ed_layer_game.cpp 1209633421 0 /home/kma/code/teeworlds/trunk/src/game/editor/ed_layer_game.cpp
-/home/kma/code/teeworlds/trunk/src/game/client/components/mapimages.cpp 1220253155 0 /home/kma/code/teeworlds/trunk/src/game/client/components/mapimages.cpp
-/home/kma/code/teeworlds/trunk/src/engine/e_keynames.c 1222353741 0 /home/kma/code/teeworlds/trunk/src/engine/e_keynames.c
-/home/kma/code/teeworlds/trunk/src/game/server/gamecontroller.cpp 1222194081 0 /home/kma/code/teeworlds/trunk/src/game/server/gamecontroller.cpp
-/home/kma/code/teeworlds/trunk/src/game/client/ui.cpp 1220136096 0 /home/kma/code/teeworlds/trunk/src/game/client/ui.cpp
-/home/kma/code/teeworlds/trunk/src/game/client/components/nameplates.cpp 1222164899 0 /home/kma/code/teeworlds/trunk/src/game/client/components/nameplates.cpp
-/home/kma/code/teeworlds/trunk/src/game/client/components/broadcast.cpp 1220135264 0 /home/kma/code/teeworlds/trunk/src/game/client/components/broadcast.cpp
-/home/kma/code/teeworlds/trunk/src/engine/e_map.c 1218717325 0 /home/kma/code/teeworlds/trunk/src/engine/e_map.c
-/home/kma/code/teeworlds/trunk/src/game/mapitems.hpp 1222183329 0 /home/kma/code/teeworlds/trunk/src/game/mapitems.hpp
-/home/kma/code/teeworlds/trunk/src/game/gamecore.cpp 1222186019 0 /home/kma/code/teeworlds/trunk/src/game/gamecore.cpp
-/home/kma/code/teeworlds/trunk/src/game/server/hooks.cpp 1222682379 0 /home/kma/code/teeworlds/trunk/src/game/server/hooks.cpp
-/home/kma/code/teeworlds/trunk/src/game/layers.hpp 1218967138 0 /home/kma/code/teeworlds/trunk/src/game/layers.hpp
-/home/kma/code/teeworlds/trunk/src/game/client/components/killmessages.hpp 1219841185 0 /home/kma/code/teeworlds/trunk/src/game/client/components/killmessages.hpp
-/home/kma/code/teeworlds/trunk/src/engine/e_console.c 1222181217 0 /home/kma/code/teeworlds/trunk/src/engine/e_console.c
-/home/kma/code/teeworlds/trunk/src/game/client/components/sounds.cpp 1222029308 0 /home/kma/code/teeworlds/trunk/src/game/client/components/sounds.cpp
-/home/kma/code/teeworlds/trunk/src/game/client/components/emoticon.cpp 1220569076 0 /home/kma/code/teeworlds/trunk/src/game/client/components/emoticon.cpp
-/home/kma/code/teeworlds/trunk/src/game/client/components/skins.cpp 1219618613 0 /home/kma/code/teeworlds/trunk/src/game/client/components/skins.cpp
-/home/kma/code/teeworlds/trunk/src/game/client/components/effects.cpp 1220135224 0 /home/kma/code/teeworlds/trunk/src/game/client/components/effects.cpp
-/home/kma/code/teeworlds/trunk/src/game/server/player.hpp 1222356463 0 /home/kma/code/teeworlds/trunk/src/game/server/player.hpp
-/home/kma/code/teeworlds/trunk/src/game/client/lineinput.hpp 1220087940 0 /home/kma/code/teeworlds/trunk/src/game/client/lineinput.hpp
-/home/kma/code/teeworlds/trunk/src/engine/server/es_server.c 1222638818 0 /home/kma/code/teeworlds/trunk/src/engine/server/es_server.c
-/home/kma/code/teeworlds/trunk/src/game/server/entities/projectile.hpp 1218741010 0 /home/kma/code/teeworlds/trunk/src/game/server/entities/projectile.hpp
-/home/kma/code/teeworlds/trunk/src/game/client/components/debughud.cpp 1220135200 0 /home/kma/code/teeworlds/trunk/src/game/client/components/debughud.cpp
-/home/kma/code/teeworlds/trunk/src/game/client/components/items.hpp 1219841173 0 /home/kma/code/teeworlds/trunk/src/game/client/components/items.hpp
-/home/kma/code/teeworlds/trunk/src/game/server/player.cpp 1222273690 0 /home/kma/code/teeworlds/trunk/src/game/server/player.cpp
-/home/kma/code/teeworlds/trunk/src/game/client/components/sounds.hpp 1221328048 0 /home/kma/code/teeworlds/trunk/src/game/client/components/sounds.hpp
-/home/kma/code/teeworlds/trunk/src/game/client/components/maplist.hpp 1222691020 0 /home/kma/code/teeworlds/trunk/src/game/client/components/maplist.hpp
-/home/kma/code/teeworlds/trunk/src/engine/e_snapshot.c 1214463651 0 /home/kma/code/teeworlds/trunk/src/engine/e_snapshot.c
-/home/kma/code/teeworlds/trunk/src/game/client/components/binds.hpp 1222354232 0 /home/kma/code/teeworlds/trunk/src/game/client/components/binds.hpp
-/home/kma/code/teeworlds/trunk/src/game/server/entities/character.cpp 1222356921 0 /home/kma/code/teeworlds/trunk/src/game/server/entities/character.cpp
-/home/kma/code/teeworlds/trunk/src/game/server/entities/laser.cpp 1222190271 0 /home/kma/code/teeworlds/trunk/src/game/server/entities/laser.cpp
-/home/kma/code/teeworlds/trunk/src/engine/docs/snapshots.txt 1218450372 1 Snapshots
-/home/kma/code/teeworlds/trunk/src/game/generated/gc_data.hpp 1222683447 0 /home/kma/code/teeworlds/trunk/src/game/generated/gc_data.hpp
-/home/kma/code/teeworlds/trunk/src/game/generated/nethash.c 1222161195 0 /home/kma/code/teeworlds/trunk/src/game/generated/nethash.c
-/home/kma/code/teeworlds/trunk/src/engine/e_ringbuffer.h 1219871251 0 /home/kma/code/teeworlds/trunk/src/engine/e_ringbuffer.h
-/home/kma/code/teeworlds/trunk/src/game/client/gameclient.cpp 1222692136 0 /home/kma/code/teeworlds/trunk/src/game/client/gameclient.cpp
-/home/kma/code/teeworlds/trunk/src/game/client/components/killmessages.cpp 1220198084 0 /home/kma/code/teeworlds/trunk/src/game/client/components/killmessages.cpp
-/home/kma/code/teeworlds/trunk/src/game/server/entity.cpp 1218743197 0 /home/kma/code/teeworlds/trunk/src/game/server/entity.cpp
-/home/kma/code/teeworlds/trunk/src/game/client/components/controls.cpp 1221290669 0 /home/kma/code/teeworlds/trunk/src/game/client/components/controls.cpp
-/home/kma/code/teeworlds/trunk/src/engine/e_if_gfx.h 1220477125 1 Graphics
-/home/kma/code/teeworlds/trunk/src/game/client/components/motd.cpp 1220135205 0 /home/kma/code/teeworlds/trunk/src/game/client/components/motd.cpp
-/home/kma/code/teeworlds/trunk/src/engine/e_protocol.h 1220799767 0 /home/kma/code/teeworlds/trunk/src/engine/e_protocol.h
-/home/kma/code/teeworlds/trunk/src/game/client/gameclient.hpp 1222691935 0 /home/kma/code/teeworlds/trunk/src/game/client/gameclient.hpp
-/home/kma/code/teeworlds/trunk/src/engine/e_datafile.c 1218717112 0 /home/kma/code/teeworlds/trunk/src/engine/e_datafile.c
-/home/kma/code/teeworlds/trunk/src/engine/e_huffman.c 1222170780 0 /home/kma/code/teeworlds/trunk/src/engine/e_huffman.c
-/home/kma/code/teeworlds/trunk/src/engine/docs/server_op.txt 1218450372 1 Server Operation
-/home/kma/code/teeworlds/trunk/src/game/editor/ed_editor.cpp 1222182161 0 /home/kma/code/teeworlds/trunk/src/game/editor/ed_editor.cpp
-/home/kma/code/teeworlds/trunk/src/game/client/gc_render.cpp 1220295093 0 /home/kma/code/teeworlds/trunk/src/game/client/gc_render.cpp
-/home/kma/code/teeworlds/trunk/src/game/client/components/maplayers.hpp 1219841173 0 /home/kma/code/teeworlds/trunk/src/game/client/components/maplayers.hpp
-/home/kma/code/teeworlds/trunk/src/engine/e_if_client.h 1222031069 1 Client Interface
-/home/kma/code/teeworlds/trunk/src/engine/e_keys.h 1222353741 0 /home/kma/code/teeworlds/trunk/src/engine/e_keys.h
-/home/kma/code/teeworlds/trunk/src/game/client/components/console.hpp 1220569113 0 /home/kma/code/teeworlds/trunk/src/game/client/components/console.hpp
-/home/kma/code/teeworlds/trunk/src/engine/e_engine.c 1220822064 0 /home/kma/code/teeworlds/trunk/src/engine/e_engine.c
-/home/kma/code/teeworlds/trunk/src/engine/e_if_modc.h 1209633421 1 Client Hooks
-/home/kma/code/teeworlds/trunk/src/game/client/components/particles.cpp 1220138535 0 /home/kma/code/teeworlds/trunk/src/game/client/components/particles.cpp
-/home/kma/code/teeworlds/trunk/src/engine/e_ringbuffer.c 1218717337 0 /home/kma/code/teeworlds/trunk/src/engine/e_ringbuffer.c
-/home/kma/code/teeworlds/trunk/src/game/server/gamemodes/dm.hpp 1220222050 0 /home/kma/code/teeworlds/trunk/src/game/server/gamemodes/dm.hpp
-/home/kma/code/teeworlds/trunk/src/engine/e_server_interface.h 1209633421 0 /home/kma/code/teeworlds/trunk/src/engine/e_server_interface.h
-/home/kma/code/teeworlds/trunk/src/game/client/components/binds.cpp 1222354494 0 /home/kma/code/teeworlds/trunk/src/game/client/components/binds.cpp
-/home/kma/code/teeworlds/trunk/src/engine/e_packer.c 1218717159 0 /home/kma/code/teeworlds/trunk/src/engine/e_packer.c
-/home/kma/code/teeworlds/trunk/src/game/client/components/particles.hpp 1219845940 0 /home/kma/code/teeworlds/trunk/src/game/client/components/particles.hpp
-/home/kma/code/teeworlds/trunk/src/engine/e_config.h 1209633421 0 /home/kma/code/teeworlds/trunk/src/engine/e_config.h
-/home/kma/code/teeworlds/trunk/src/game/tuning.hpp 1218966967 0 /home/kma/code/teeworlds/trunk/src/game/tuning.hpp
-/home/kma/code/teeworlds/trunk/src/game/server/gamecontext.hpp 1222356971 0 /home/kma/code/teeworlds/trunk/src/game/server/gamecontext.hpp
-/home/kma/code/teeworlds/trunk/src/game/client/components/players.cpp 1222347355 0 /home/kma/code/teeworlds/trunk/src/game/client/components/players.cpp
-/home/kma/code/teeworlds/trunk/src/game/client/components/controls.hpp 1221290643 0 /home/kma/code/teeworlds/trunk/src/game/client/components/controls.hpp
-/home/kma/code/teeworlds/trunk/src/engine/e_jobs.h 1220813546 0 /home/kma/code/teeworlds/trunk/src/engine/e_jobs.h
-/home/kma/code/teeworlds/trunk/src/engine/e_memheap.c 1218717128 0 /home/kma/code/teeworlds/trunk/src/engine/e_memheap.c
-/home/kma/code/teeworlds/trunk/src/game/client/lineinput.cpp 1219040530 0 /home/kma/code/teeworlds/trunk/src/game/client/lineinput.cpp
-/home/kma/code/teeworlds/trunk/src/game/generated/createdir.txt 1209633421 0 /home/kma/code/teeworlds/trunk/src/game/generated/createdir.txt
-/home/kma/code/teeworlds/trunk/src/game/client/components/maplist.cpp 1222692119 0 /home/kma/code/teeworlds/trunk/src/game/client/components/maplist.cpp
-/home/kma/code/teeworlds/trunk/src/game/version.hpp 1218966879 0 /home/kma/code/teeworlds/trunk/src/game/version.hpp
-/home/kma/code/teeworlds/trunk/src/game/collision.hpp 1222185632 0 /home/kma/code/teeworlds/trunk/src/game/collision.hpp
-/home/kma/code/teeworlds/trunk/src/engine/client/ec_client.c 1222683366 0 /home/kma/code/teeworlds/trunk/src/engine/client/ec_client.c
-/home/kma/code/teeworlds/trunk/src/game/generated/g_protocol.cpp 1222683446 0 /home/kma/code/teeworlds/trunk/src/game/generated/g_protocol.cpp
-/home/kma/code/teeworlds/trunk/src/engine/e_datafile.h 1209633421 0 /home/kma/code/teeworlds/trunk/src/engine/e_datafile.h
-/home/kma/code/teeworlds/trunk/src/engine/e_linereader.h 1218717511 0 /home/kma/code/teeworlds/trunk/src/engine/e_linereader.h
-/home/kma/code/teeworlds/trunk/src/game/server/entities/pickup.cpp 1220570254 0 /home/kma/code/teeworlds/trunk/src/game/server/entities/pickup.cpp
-/home/kma/code/teeworlds/trunk/src/game/client/components/maplayers.cpp 1220253273 0 /home/kma/code/teeworlds/trunk/src/game/client/components/maplayers.cpp
-/home/kma/code/teeworlds/trunk/src/game/client/components/hud.cpp 1222355982 0 /home/kma/code/teeworlds/trunk/src/game/client/components/hud.cpp
-/home/kma/code/teeworlds/trunk/src/game/server/gamemodes/tdm.hpp 1218741462 0 /home/kma/code/teeworlds/trunk/src/game/server/gamemodes/tdm.hpp
-/home/kma/code/teeworlds/trunk/src/game/client/components/menus_browser.cpp 1222640967 0 /home/kma/code/teeworlds/trunk/src/game/client/components/menus_browser.cpp
-/home/kma/code/teeworlds/trunk/src/game/collision.cpp 1222185936 0 /home/kma/code/teeworlds/trunk/src/game/collision.cpp
-/home/kma/code/teeworlds/trunk/src/engine/e_snapshot.h 1218717534 0 /home/kma/code/teeworlds/trunk/src/engine/e_snapshot.h
-/home/kma/code/teeworlds/trunk/src/engine/e_client_interface.h 1220135564 0 /home/kma/code/teeworlds/trunk/src/engine/e_client_interface.h
-/home/kma/code/teeworlds/trunk/src/game/editor/ed_layer_tiles.cpp 1220827108 0 /home/kma/code/teeworlds/trunk/src/game/editor/ed_layer_tiles.cpp
-/home/kma/code/teeworlds/trunk/src/engine/e_network.h 1220214060 0 /home/kma/code/teeworlds/trunk/src/engine/e_network.h
-/home/kma/code/teeworlds/trunk/src/game/client/components/emoticon.hpp 1220569077 0 /home/kma/code/teeworlds/trunk/src/game/client/components/emoticon.hpp
-/home/kma/code/teeworlds/trunk/src/engine/e_config.c 1222181231 0 /home/kma/code/teeworlds/trunk/src/engine/e_config.c
-/home/kma/code/teeworlds/trunk/src/game/client/components/menus.hpp 1222681494 0 /home/kma/code/teeworlds/trunk/src/game/client/components/menus.hpp
-/home/kma/code/teeworlds/trunk/src/game/server/gamemodes/ctf.cpp 1222190258 0 /home/kma/code/teeworlds/trunk/src/game/server/gamemodes/ctf.cpp
-/home/kma/code/teeworlds/trunk/src/engine/e_config_variables.h 1222181173 0 /home/kma/code/teeworlds/trunk/src/engine/e_config_variables.h
-/home/kma/code/teeworlds/trunk/src/engine/docs/prediction.txt 1209633420 1 Prediction
-/home/kma/code/teeworlds/trunk/src/game/client/components/voting.hpp 1222692628 0 /home/kma/code/teeworlds/trunk/src/game/client/components/voting.hpp
-/home/kma/code/teeworlds/trunk/src/game/client/components/camera.cpp 1221209283 0 /home/kma/code/teeworlds/trunk/src/game/client/components/camera.cpp
-/home/kma/code/teeworlds/trunk/src/game/client/components/damageind.cpp 1220136328 0 /home/kma/code/teeworlds/trunk/src/game/client/components/damageind.cpp
-/home/kma/code/teeworlds/trunk/src/game/client/components/chat.hpp 1220569130 0 /home/kma/code/teeworlds/trunk/src/game/client/components/chat.hpp
-/home/kma/code/teeworlds/trunk/src/game/editor/ed_popups.cpp 1209633421 0 /home/kma/code/teeworlds/trunk/src/game/editor/ed_popups.cpp
-/home/kma/code/teeworlds/trunk/src/engine/client/ec_font.c 1218724640 0 /home/kma/code/teeworlds/trunk/src/engine/client/ec_font.c
-/home/kma/code/teeworlds/trunk/src/game/client/component.hpp 1220568968 0 /home/kma/code/teeworlds/trunk/src/game/client/component.hpp
-/home/kma/code/teeworlds/trunk/src/game/client/components/voting.cpp 1222692648 0 /home/kma/code/teeworlds/trunk/src/game/client/components/voting.cpp
-/home/kma/code/teeworlds/trunk/src/game/client/components/debughud.hpp 1219855509 0 /home/kma/code/teeworlds/trunk/src/game/client/components/debughud.hpp
-/home/kma/code/teeworlds/trunk/src/game/client/components/skins.hpp 1219841173 0 /home/kma/code/teeworlds/trunk/src/game/client/components/skins.hpp
-/home/kma/code/teeworlds/trunk/src/game/client/components/scoreboard.hpp 1220569089 0 /home/kma/code/teeworlds/trunk/src/game/client/components/scoreboard.hpp
-/home/kma/code/teeworlds/trunk/src/engine/e_common_interface.h 1209633421 0 /home/kma/code/teeworlds/trunk/src/engine/e_common_interface.h
-/home/kma/code/teeworlds/trunk/src/engine/e_if_mods.h 1209633421 1 Server Hooks
-/home/kma/code/teeworlds/trunk/src/game/client/components/scoreboard.cpp 1220827108 0 /home/kma/code/teeworlds/trunk/src/game/client/components/scoreboard.cpp
-/home/kma/code/teeworlds/trunk/src/game/server/gameworld.cpp 1220827108 0 /home/kma/code/teeworlds/trunk/src/game/server/gameworld.cpp
-/home/kma/code/teeworlds/trunk/src/game/server/eventhandler.cpp 1222190459 0 /home/kma/code/teeworlds/trunk/src/game/server/eventhandler.cpp
-/home/kma/code/teeworlds/trunk/src/game/client/components/chat.cpp 1220827108 0 /home/kma/code/teeworlds/trunk/src/game/client/components/chat.cpp
-/home/kma/code/teeworlds/trunk/src/game/client/gc_render_map.cpp 1220135308 0 /home/kma/code/teeworlds/trunk/src/game/client/gc_render_map.cpp
-/home/kma/code/teeworlds/trunk/src/game/server/gameworld.hpp 1218967107 1 Game World
-/home/kma/code/teeworlds/trunk/src/game/gamecore.hpp 1222185988 0 /home/kma/code/teeworlds/trunk/src/game/gamecore.hpp
-/home/kma/code/teeworlds/trunk/src/engine/client/ec_inp.c 1218724618 0 /home/kma/code/teeworlds/trunk/src/engine/client/ec_inp.c
-/home/kma/code/teeworlds/trunk/src/engine/client/ec_snd.c 1222029620 0 /home/kma/code/teeworlds/trunk/src/engine/client/ec_snd.c
-/home/kma/code/teeworlds/trunk/src/engine/e_if_inp.h 1209633421 1 Input
-/home/kma/code/teeworlds/trunk/src/engine/e_jobs.c 1220818102 0 /home/kma/code/teeworlds/trunk/src/engine/e_jobs.c
-/home/kma/code/teeworlds/trunk/src/game/client/components/menus_settings.cpp 1222353486 0 /home/kma/code/teeworlds/trunk/src/game/client/components/menus_settings.cpp
-/home/kma/code/teeworlds/trunk/src/engine/client/ec_gfx.c 1220477125 0 /home/kma/code/teeworlds/trunk/src/engine/client/ec_gfx.c
-/home/kma/code/teeworlds/trunk/src/game/server/entities/character.hpp 1222203546 0 /home/kma/code/teeworlds/trunk/src/game/server/entities/character.hpp
-/home/kma/code/teeworlds/trunk/src/game/server/eventhandler.hpp 1218742466 0 /home/kma/code/teeworlds/trunk/src/game/server/eventhandler.hpp
-/home/kma/code/teeworlds/trunk/src/game/client/clienthooks.cpp 1220568950 0 /home/kma/code/teeworlds/trunk/src/game/client/clienthooks.cpp
-/home/kma/code/teeworlds/trunk/src/game/client/components/console.cpp 1220569111 0 /home/kma/code/teeworlds/trunk/src/game/client/components/console.cpp
-/home/kma/code/teeworlds/trunk/src/game/variables.hpp 1222682334 0 /home/kma/code/teeworlds/trunk/src/game/variables.hpp
-/home/kma/code/teeworlds/trunk/src/engine/e_linereader.c 1209633421 0 /home/kma/code/teeworlds/trunk/src/engine/e_linereader.c
-/home/kma/code/teeworlds/trunk/src/engine/e_memheap.h 1209633421 0 /home/kma/code/teeworlds/trunk/src/engine/e_memheap.h
-/home/kma/code/teeworlds/trunk/src/engine/e_console.h 1219858821 0 /home/kma/code/teeworlds/trunk/src/engine/e_console.h
-/home/kma/code/teeworlds/trunk/src/engine/e_network.c 1222251355 0 /home/kma/code/teeworlds/trunk/src/engine/e_network.c
-/home/kma/code/teeworlds/trunk/src/game/server/gamecontroller.hpp 1220827108 1 Game Controller
-/home/kma/code/teeworlds/trunk/src/game/layers.cpp 1218967120 0 /home/kma/code/teeworlds/trunk/src/game/layers.cpp
-/home/kma/code/teeworlds/trunk/src/engine/e_if_server.h 1220195032 1 Server Interface
-/home/kma/code/teeworlds/trunk/src/game/client/animstate.hpp 1219785206 0 /home/kma/code/teeworlds/trunk/src/game/client/animstate.hpp
-/home/kma/code/teeworlds/trunk/src/game/server/entities/projectile.cpp 1222190276 0 /home/kma/code/teeworlds/trunk/src/game/server/entities/projectile.cpp
-/home/kma/code/teeworlds/trunk/src/game/editor/ed_layer_quads.cpp 1218738227 0 /home/kma/code/teeworlds/trunk/src/game/editor/ed_layer_quads.cpp
-/home/kma/code/teeworlds/trunk/src/game/server/entities/pickup.hpp 1218740990 0 /home/kma/code/teeworlds/trunk/src/game/server/entities/pickup.hpp
-/home/kma/code/teeworlds/trunk/src/game/server/entity.hpp 1222252624 1 Entity
-/home/kma/code/teeworlds/trunk/src/game/generated/g_protocol.hpp 1222683446 0 /home/kma/code/teeworlds/trunk/src/game/generated/g_protocol.hpp
-/home/kma/code/teeworlds/trunk/src/game/client/gc_render.hpp 1222182049 0 /home/kma/code/teeworlds/trunk/src/game/client/gc_render.hpp
-/home/kma/code/teeworlds/trunk/src/engine/server/es_register.c 1218717909 0 /home/kma/code/teeworlds/trunk/src/engine/server/es_register.c
-/home/kma/code/teeworlds/trunk/src/game/client/components/flow.hpp 1219841173 0 /home/kma/code/teeworlds/trunk/src/game/client/components/flow.hpp
-/home/kma/code/teeworlds/trunk/src/game/client/components/mapimages.hpp 1220253106 0 /home/kma/code/teeworlds/trunk/src/game/client/components/mapimages.hpp
-/home/kma/code/teeworlds/trunk/src/game/client/components/players.hpp 1219841173 0 /home/kma/code/teeworlds/trunk/src/game/client/components/players.hpp
diff --git a/docs/conf/Data/ImageFileInfo.nd b/docs/conf/Data/ImageFileInfo.nd
deleted file mode 100644
index e6ccf0d..0000000
Binary files a/docs/conf/Data/ImageFileInfo.nd and /dev/null differ
diff --git a/docs/conf/Data/ImageReferenceTable.nd b/docs/conf/Data/ImageReferenceTable.nd
deleted file mode 100644
index e6ccf0d..0000000
Binary files a/docs/conf/Data/ImageReferenceTable.nd and /dev/null differ
diff --git a/docs/conf/Data/IndexInfo.nd b/docs/conf/Data/IndexInfo.nd
deleted file mode 100644
index c175f4b..0000000
Binary files a/docs/conf/Data/IndexInfo.nd and /dev/null differ
diff --git a/docs/conf/Data/PreviousMenuState.nd b/docs/conf/Data/PreviousMenuState.nd
deleted file mode 100644
index 4422ee5..0000000
Binary files a/docs/conf/Data/PreviousMenuState.nd and /dev/null differ
diff --git a/docs/conf/Data/PreviousSettings.nd b/docs/conf/Data/PreviousSettings.nd
deleted file mode 100644
index 7f5fdf3..0000000
Binary files a/docs/conf/Data/PreviousSettings.nd and /dev/null differ
diff --git a/docs/conf/Data/SymbolTable.nd b/docs/conf/Data/SymbolTable.nd
deleted file mode 100644
index dbf8ec2..0000000
Binary files a/docs/conf/Data/SymbolTable.nd and /dev/null differ
diff --git a/docs/conf/Languages.txt b/docs/conf/Languages.txt
deleted file mode 100644
index be96913..0000000
--- a/docs/conf/Languages.txt
+++ /dev/null
@@ -1,113 +0,0 @@
-Format: 1.4
-
-# This is the Natural Docs languages file for this project. If you change
-# anything here, it will apply to THIS PROJECT ONLY. If you'd like to change
-# something for all your projects, edit the Languages.txt in Natural Docs'
-# Config directory instead.
-
-
-# You can prevent certain file extensions from being scanned like this:
-# Ignore Extensions: [extension] [extension] ...
-
-
-#-------------------------------------------------------------------------------
-# SYNTAX:
-#
-# Unlike other Natural Docs configuration files, in this file all comments
-# MUST be alone on a line. Some languages deal with the # character, so you
-# cannot put comments on the same line as content.
-#
-# Also, all lists are separated with spaces, not commas, again because some
-# languages may need to use them.
-#
-# Language: [name]
-# Alter Language: [name]
-# Defines a new language or alters an existing one. Its name can use any
-# characters. If any of the properties below have an add/replace form, you
-# must use that when using Alter Language.
-#
-# The language Shebang Script is special. It's entry is only used for
-# extensions, and files with those extensions have their shebang (#!) lines
-# read to determine the real language of the file. Extensionless files are
-# always treated this way.
-#
-# The language Text File is also special. It's treated as one big comment
-# so you can put Natural Docs content in them without special symbols. Also,
-# if you don't specify a package separator, ignored prefixes, or enum value
-# behavior, it will copy those settings from the language that is used most
-# in the source tree.
-#
-# Extensions: [extension] [extension] ...
-# [Add/Replace] Extensions: [extension] [extension] ...
-# Defines the file extensions of the language's source files. You can
-# redefine extensions found in the main languages file. You can use * to
-# mean any undefined extension.
-#
-# Shebang Strings: [string] [string] ...
-# [Add/Replace] Shebang Strings: [string] [string] ...
-# Defines a list of strings that can appear in the shebang (#!) line to
-# designate that it's part of the language. You can redefine strings found
-# in the main languages file.
-#
-# Ignore Prefixes in Index: [prefix] [prefix] ...
-# [Add/Replace] Ignored Prefixes in Index: [prefix] [prefix] ...
-#
-# Ignore [Topic Type] Prefixes in Index: [prefix] [prefix] ...
-# [Add/Replace] Ignored [Topic Type] Prefixes in Index: [prefix] [prefix] ...
-# Specifies prefixes that should be ignored when sorting symbols in an
-# index. Can be specified in general or for a specific topic type.
-#
-#------------------------------------------------------------------------------
-# For basic language support only:
-#
-# Line Comments: [symbol] [symbol] ...
-# Defines a space-separated list of symbols that are used for line comments,
-# if any.
-#
-# Block Comments: [opening sym] [closing sym] [opening sym] [closing sym] ...
-# Defines a space-separated list of symbol pairs that are used for block
-# comments, if any.
-#
-# Package Separator: [symbol]
-# Defines the default package separator symbol. The default is a dot.
-#
-# [Topic Type] Prototype Enders: [symbol] [symbol] ...
-# When defined, Natural Docs will attempt to get a prototype from the code
-# immediately following the topic type. It stops when it reaches one of
-# these symbols. Use \n for line breaks.
-#
-# Line Extender: [symbol]
-# Defines the symbol that allows a prototype to span multiple lines if
-# normally a line break would end it.
-#
-# Enum Values: [global|under type|under parent]
-# Defines how enum values are referenced. The default is global.
-# global - Values are always global, referenced as 'value'.
-# under type - Values are under the enum type, referenced as
-# 'package.enum.value'.
-# under parent - Values are under the enum's parent, referenced as
-# 'package.value'.
-#
-# Perl Package: [perl package]
-# Specifies the Perl package used to fine-tune the language behavior in ways
-# too complex to do in this file.
-#
-#------------------------------------------------------------------------------
-# For full language support only:
-#
-# Full Language Support: [perl package]
-# Specifies the Perl package that has the parsing routines necessary for full
-# language support.
-#
-#-------------------------------------------------------------------------------
-
-# The following languages are defined in the main file, if you'd like to alter
-# them:
-#
-# Text File, Shebang Script, C/C++, C#, Java, JavaScript, Perl, Python,
-# PHP, SQL, Visual Basic, Pascal, Assembly, Ada, Tcl, Ruby, Makefile,
-# ActionScript, ColdFusion, R, Fortran
-
-# If you add a language that you think would be useful to other developers
-# and should be included in Natural Docs by default, please e-mail it to
-# languages [at] naturaldocs [dot] org.
diff --git a/docs/conf/Menu.txt b/docs/conf/Menu.txt
deleted file mode 100644
index 95aec56..0000000
--- a/docs/conf/Menu.txt
+++ /dev/null
@@ -1,113 +0,0 @@
-Format: 1.4
-
-
-# You can add a title and sub-title to your menu like this:
-# Title: [project name]
-# SubTitle: [subtitle]
-
-# You can add a footer to your documentation like this:
-# Footer: [text]
-# If you want to add a copyright notice, this would be the place to do it.
-
-# You can add a timestamp to your documentation like one of these:
-# Timestamp: Generated on month day, year
-# Timestamp: Updated mm/dd/yyyy
-# Timestamp: Last updated mon day
-#
-# m - One or two digit month. January is "1"
-# mm - Always two digit month. January is "01"
-# mon - Short month word. January is "Jan"
-# month - Long month word. January is "January"
-# d - One or two digit day. 1 is "1"
-# dd - Always two digit day. 1 is "01"
-# day - Day with letter extension. 1 is "1st"
-# yy - Two digit year. 2006 is "06"
-# yyyy - Four digit year. 2006 is "2006"
-# year - Four digit year. 2006 is "2006"
-
-
-# --------------------------------------------------------------------------
-#
-# Cut and paste the lines below to change the order in which your files
-# appear on the menu. Don't worry about adding or removing files, Natural
-# Docs will take care of that.
-#
-# You can further organize the menu by grouping the entries. Add a
-# "Group: [name] {" line to start a group, and add a "}" to end it.
-#
-# You can add text and web links to the menu by adding "Text: [text]" and
-# "Link: [name] ([URL])" lines, respectively.
-#
-# The formatting and comments are auto-generated, so don't worry about
-# neatness when editing the file. Natural Docs will clean it up the next
-# time it is run. When working with groups, just deal with the braces and
-# forget about the indentation and comments.
-#
-# You can use this file on other computers even if they use different
-# directories. As long as the command line points to the same source files,
-# Natural Docs will be able to correct the locations automatically.
-#
-# --------------------------------------------------------------------------
-
-
-Group: Engine {
-
- File: Messaging (/home/kma/code/teeworlds/trunk/src/engine/e_if_msg.h)
-
- Group: Client {
-
- Group: Overview {
-
- File: Time on the client (/home/kma/code/teeworlds/trunk/src/engine/docs/client_time.txt)
- File: Prediction (/home/kma/code/teeworlds/trunk/src/engine/docs/prediction.txt)
- File: Snapshots (/home/kma/code/teeworlds/trunk/src/engine/docs/snapshots.txt)
- File: Server Operation (/home/kma/code/teeworlds/trunk/src/engine/docs/server_op.txt)
- } # Group: Overview
-
- Group: Reference {
-
- File: Client Hooks (/home/kma/code/teeworlds/trunk/src/engine/e_if_modc.h)
- File: Client Interface (/home/kma/code/teeworlds/trunk/src/engine/e_if_client.h)
- File: e_huffman.h (/home/kma/code/teeworlds/trunk/src/engine/e_huffman.h)
- File: Engine Interface (/home/kma/code/teeworlds/trunk/src/engine/e_if_other.h)
- File: Graphics (/home/kma/code/teeworlds/trunk/src/engine/e_if_gfx.h)
- File: Input (/home/kma/code/teeworlds/trunk/src/engine/e_if_inp.h)
- File: Sound (/home/kma/code/teeworlds/trunk/src/engine/e_if_snd.h)
- } # Group: Reference
-
- } # Group: Client
-
- Group: Server {
-
- Group: Reference {
-
- File: Server Hooks (/home/kma/code/teeworlds/trunk/src/engine/e_if_mods.h)
- File: Server Interface (/home/kma/code/teeworlds/trunk/src/engine/e_if_server.h)
- } # Group: Reference
-
- } # Group: Server
-
- } # Group: Engine
-
-Group: Game {
-
- File: Entity (/home/kma/code/teeworlds/trunk/src/game/server/entity.hpp)
- File: Game Controller (/home/kma/code/teeworlds/trunk/src/game/server/gamecontroller.hpp)
- File: Game World (/home/kma/code/teeworlds/trunk/src/game/server/gameworld.hpp)
- } # Group: Game
-
-Group: Index {
-
- Index: Everything
- Class Index: Classes
- Constant Index: Constants
- Function Index: Functions
- Variable Index: Variables
- File Index: Files
- } # Group: Index
-
-
-
-##### Do not change or remove these lines. #####
-Data: 1(D3333RuEG3AEp39ufG3tGG7uHof63tHN\A36H93`pEG)
-Data: 1(h3333RuEG3AEp39ufG3tGG7uHof63tHN\A36H93G\`8\G)
diff --git a/docs/conf/Topics.txt b/docs/conf/Topics.txt
deleted file mode 100644
index b1a9b93..0000000
--- a/docs/conf/Topics.txt
+++ /dev/null
@@ -1,81 +0,0 @@
-Format: 1.4
-
-# This is the Natural Docs topics file for this project. If you change anything
-# here, it will apply to THIS PROJECT ONLY. If you'd like to change something
-# for all your projects, edit the Topics.txt in Natural Docs' Config directory
-# instead.
-
-
-# If you'd like to prevent keywords from being recognized by Natural Docs, you
-# can do it like this:
-# Ignore Keywords: [keyword], [keyword], ...
-#
-# Or you can use the list syntax like how they are defined:
-# Ignore Keywords:
-# [keyword]
-# [keyword], [plural keyword]
-# ...
-
-
-#-------------------------------------------------------------------------------
-# SYNTAX:
-#
-# Topic Type: [name]
-# Alter Topic Type: [name]
-# Creates a new topic type or alters one from the main file. Each type gets
-# its own index and behavior settings. Its name can have letters, numbers,
-# spaces, and these charaters: - / . '
-#
-# Plural: [name]
-# Sets the plural name of the topic type, if different.
-#
-# Keywords:
-# [keyword]
-# [keyword], [plural keyword]
-# ...
-# Defines or adds to the list of keywords for the topic type. They may only
-# contain letters, numbers, and spaces and are not case sensitive. Plural
-# keywords are used for list topics. You can redefine keywords found in the
-# main topics file.
-#
-# Index: [yes|no]
-# Whether the topics get their own index. Defaults to yes. Everything is
-# included in the general index regardless of this setting.
-#
-# Scope: [normal|start|end|always global]
-# How the topics affects scope. Defaults to normal.
-# normal - Topics stay within the current scope.
-# start - Topics start a new scope for all the topics beneath it,
-# like class topics.
-# end - Topics reset the scope back to global for all the topics
-# beneath it.
-# always global - Topics are defined as global, but do not change the scope
-# for any other topics.
-#
-# Class Hierarchy: [yes|no]
-# Whether the topics are part of the class hierarchy. Defaults to no.
-#
-# Page Title If First: [yes|no]
-# Whether the topic's title becomes the page title if it's the first one in
-# a file. Defaults to no.
-#
-# Break Lists: [yes|no]
-# Whether list topics should be broken into individual topics in the output.
-# Defaults to no.
-#
-# Can Group With: [type], [type], ...
-# Defines a list of topic types that this one can possibly be grouped with.
-# Defaults to none.
-#-------------------------------------------------------------------------------
-
-# The following topics are defined in the main file, if you'd like to alter
-# their behavior or add keywords:
-#
-# Generic, Class, Interface, Section, File, Group, Function, Variable,
-# Property, Type, Constant, Enumeration, Event, Delegate, Macro,
-# Database, Database Table, Database View, Database Index, Database
-# Cursor, Database Trigger, Cookie, Build Target
-
-# If you add something that you think would be useful to other developers
-# and should be included in Natural Docs by default, please e-mail it to
-# topics [at] naturaldocs [dot] org.
diff --git a/scripts/make_release.py b/scripts/make_release.py
index 90c8a96..b8f82fe 100644
--- a/scripts/make_release.py
+++ b/scripts/make_release.py
@@ -31,7 +31,7 @@ if platform == "src":
# print(valid_platforms)
# sys.exit(-1)
-if platform == 'win32':
+if platform == 'win32' or platform == 'win64':
exe_ext = ".exe"
use_zip = 1
use_gz = 0
diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp
index 581c7e6..ab0f312 100644
--- a/src/engine/server/server.cpp
+++ b/src/engine/server/server.cpp
@@ -845,8 +845,8 @@ void CServer::ProcessClientPacket(CNetChunk *pPacket)
return;
int Chunk = Unpacker.GetInt();
- int ChunkSize = 1024-128;
- int Offset = Chunk * ChunkSize;
+ unsigned int ChunkSize = 1024-128;
+ unsigned int Offset = Chunk * ChunkSize;
int Last = 0;
// drop faulty map data requests
diff --git a/src/engine/shared/console.h b/src/engine/shared/console.h
index bbe267d..a45a7fd 100644
--- a/src/engine/shared/console.h
+++ b/src/engine/shared/console.h
@@ -98,12 +98,11 @@ class CConsole : public IConsole
if(this != &Other)
{
IResult::operator=(Other);
- int Offset = m_aStringStorage - Other.m_aStringStorage;
mem_copy(m_aStringStorage, Other.m_aStringStorage, sizeof(m_aStringStorage));
- m_pArgsStart = Other.m_pArgsStart + Offset;
- m_pCommand = Other.m_pCommand + Offset;
+ m_pArgsStart = m_aStringStorage+(Other.m_pArgsStart-Other.m_aStringStorage);
+ m_pCommand = m_aStringStorage+(Other.m_pCommand-Other.m_aStringStorage);
for(unsigned i = 0; i < Other.m_NumArgs; ++i)
- m_apArgs[i] = Other.m_apArgs[i] + Offset;
+ m_apArgs[i] = m_aStringStorage+(Other.m_apArgs[i]-Other.m_aStringStorage);
}
return *this;
}
diff --git a/src/engine/shared/masterserver.cpp b/src/engine/shared/masterserver.cpp
index 9548263..59928c5 100644
--- a/src/engine/shared/masterserver.cpp
+++ b/src/engine/shared/masterserver.cpp
@@ -45,7 +45,7 @@ public:
virtual int RefreshAddresses(int Nettype)
{
- if(m_State != STATE_INIT)
+ if(m_State != STATE_INIT && m_State != STATE_READY)
return -1;
dbg_msg("engine/mastersrv", "refreshing master server addresses");
diff --git a/src/game/editor/editor.cpp b/src/game/editor/editor.cpp
index e7b917f..5e8c240 100644
--- a/src/game/editor/editor.cpp
+++ b/src/game/editor/editor.cpp
@@ -711,6 +711,11 @@ void CEditor::CallbackOpenMap(const char *pFileName, int StorageType, void *pUse
pEditor->m_Dialog = DIALOG_NONE;
pEditor->m_Map.m_Modified = false;
}
+ else
+ {
+ pEditor->Reset();
+ pEditor->m_aFileName[0] = 0;
+ }
}
void CEditor::CallbackAppendMap(const char *pFileName, int StorageType, void *pUser)
{
diff --git a/src/game/editor/io.cpp b/src/game/editor/io.cpp
index 529638c..641ec81 100644
--- a/src/game/editor/io.cpp
+++ b/src/game/editor/io.cpp
@@ -435,6 +435,7 @@ int CEditorMap::Load(class IStorage *pStorage, const char *pFileName, int Storag
editor->reset();
editor_load_old(df, this);
*/
+ return 0;
}
else if(pItem->m_Version == 1)
{
@@ -650,6 +651,8 @@ int CEditorMap::Load(class IStorage *pStorage, const char *pFileName, int Storag
}
}
}
+ else
+ return 0;
return 1;
}
diff --git a/src/game/version.h b/src/game/version.h
index 76d95dd..6634d55 100644
--- a/src/game/version.h
+++ b/src/game/version.h
@@ -3,7 +3,7 @@
#ifndef GAME_VERSION_H
#define GAME_VERSION_H
#include "generated/nethash.cpp"
-#define GAME_VERSION "0.6.2"
+#define GAME_VERSION "0.6.3"
#define GAME_NETVERSION "0.6 " GAME_NETVERSION_HASH
static const char GAME_RELEASE_VERSION[8] = {'0', '.', '6', '.', '2', 0};
#endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/teeworlds.git
More information about the Pkg-games-commits
mailing list