Permalink
Browse files

* stripeslice mit in default maprotation.

 * infon auf getopt command parsing umgestellt.
 * window resizing mit opengl sollte jetzt auch unter windows funktionieren.


git-svn-id: http://infon.googlecode.com/svn/trunk@174 8171fb75-e542-0410-96e4-03d5dd800671
  • Loading branch information...
1 parent e95101f commit 99152a0e041c8e38fc8bb9d492fd8ba190e7661a @dividuum committed Jan 10, 2007
Showing with 319 additions and 120 deletions.
  1. +6 −4 Makefile
  2. 0 README → README.txt
  3. +6 −6 config.lua
  4. +219 −77 gl_gui.c
  5. +1 −0 gl_mdl.c
  6. +4 −0 global.h
  7. +73 −15 infon.c
  8. +9 −17 renderer.c
  9. +1 −1 renderer.h
View
@@ -61,7 +61,7 @@ endif
AA_RENDERER = aa_gui.so
LILITH_RENDERER = lilith_gui.so
- RENDERER = $(SDL_RENDERER) $(NULL_RENDERER)
+ RENDERER = $(SDL_RENDERER) $(NULL_RENDERER) $(GL_RENDERER)
endif
CFLAGS += -DPREFIX=\"$(PREFIX)\"
@@ -130,6 +130,8 @@ $(LILITH_RENDERER) : LDFLAGS += -lSDL -lGL -lGLU -lstdc++
$(NULL_RENDERER) : CFLAGS += -fPIC
endif
+gl_gui.o : CFLAGS += -Wno-unused
+
ifdef DEFAULT_RENDERER
$(INFON_EXECUTABLE) : CFLAGS += -DDEFAULT_RENDERER=$(DEFAULT_RENDERER)
endif
@@ -156,14 +158,14 @@ win32-client-dist: $(INFON_EXECUTABLE) $(SDL_RENDERER)
$(STRIP) $^
upx -9 --all-methods $(INFON_EXECUTABLE)
upx -9 --all-methods $(SDL_RENDERER)
- zip infon-win32-r$(REVISION).zip README $^ gfx/*.fnt gfx/*.png
+ zip infon-win32-r$(REVISION).zip README.txt $^ gfx/*.fnt gfx/*.png
linux-client-dist: $(INFON_EXECUTABLE) $(SDL_RENDERER) $(NULL_RENDERER)
strip $^
- tar cfvz infon-linux-i386-r$(REVISION).tgz README $^ gfx/*.fnt gfx/*.png
+ tar cfvz infon-linux-i386-r$(REVISION).tgz README.txt $^ gfx/*.fnt gfx/*.png
linux-server-dist: $(INFOND_EXECUTABLE)
- tar cfvz infond-linux-i386-r$(REVISION).tgz README $(INFOND_EXECUTABLE) $(INFOND_EXECUTABLE)-static *.lua level/*.lua rules/*.lua
+ tar cfvz infond-linux-i386-r$(REVISION).tgz README.txt $(INFOND_EXECUTABLE) $(INFOND_EXECUTABLE)-static *.lua level/*.lua rules/*.lua
$(INFOND_EXECUTABLE): infond.o server.o listener.o map.o path.o misc.o packet.o player.o world.o creature.o scroller.o game.o
$(CC) $^ $(LDFLAGS) -o $@
View
File renamed without changes.
View
@@ -9,7 +9,7 @@ debugpass = ""
join_info = "this message can be changed in config.lua"
-- maps to rotate
-maps = {"foo", "gpn", "water", "cn", "owl" }
+maps = {"foo", "gpn", "water", "cn", "owl", "stripeslice" }
-- rules file to use.
rules = "default"
@@ -40,11 +40,11 @@ banner = [[
/ / _( o)_ ; \
O O / ' -.\
\___;_/-. ;)
- __/ '//.
- ; / // \
- ' (INFON ) )
- \( ) )
- ' / /
+ __/ '//-.
+ ; / // \
+ ' (INFON ) )
+ \( ) )
+ ' / /
'.__.- -'
_ \\ // _
(_'_/ \_'_)
Oops, something went wrong.

0 comments on commit 99152a0

Please sign in to comment.