Permalink
Browse files

MegaZeux 2.80g release.

  • Loading branch information...
1 parent 3d03cf1 commit 98c1ee0b1445b84a1c47715583d313af99eed99b @ajs1984 committed Aug 11, 2008
Showing with 3,567 additions and 1,643 deletions.
  1. +1 −1 Makefile
  2. +10 −4 Makefile.in
  3. +1 −1 Makefile.platform
  4. +1 −1 arch/Makefile.linux
  5. +2 −2 arch/Makefile.macos
  6. +8 −1 arch/Makefile.win32
  7. +4 −4 config.sh
  8. +39 −10 config.txt
  9. +2 −2 docs/build.txt
  10. +57 −1 docs/changelog.txt
  11. +0 −237 docs/coms.txt
  12. +0 −20 docs/convmem.txt
  13. +0 −15 docs/develop.txt
  14. +276 −0 docs/exotic.txt
  15. +60 −0 docs/exotic_translations.txt
  16. 0 docs/filef268.txt
  17. +0 −8 docs/fix.doc
  18. +118 −0 docs/macro.txt
  19. 0 docs/mzm.txt
  20. +0 −1 docs/readme.txt
  21. +0 −329 docs/to_add.txt
  22. +2 −2 package.sh
  23. BIN default.spl → smzx.pal
  24. +9 −3 src/Makefile
  25. +51 −7 src/audio.cpp
  26. +13 −0 src/audio.h
  27. +8 −8 src/block.cpp
  28. +7 −4 src/board.cpp
  29. +1 −1 src/config.h
  30. +152 −72 src/configure.cpp
  31. +6 −3 src/configure.h
  32. +59 −31 src/counter.cpp
  33. +2 −0 src/counter.h
  34. +4 −23 src/data.cpp
  35. +219 −158 src/edit.cpp
  36. +1 −1 src/edit.h
  37. +21 −21 src/edit_di.cpp
  38. +50 −12 src/event.cpp
  39. +5 −0 src/event.h
  40. +13 −12 src/expr.cpp
  41. +1 −1 src/expr.h
  42. +0 −1 src/fill.cpp
  43. +106 −93 src/game.cpp
  44. +43 −11 src/graphics.cpp
  45. +4 −1 src/graphics.h
  46. +1 −0 src/intake.cpp
  47. +630 −0 src/macro.cpp
  48. +98 −0 src/macro.h
  49. +20 −8 src/main.cpp
  50. +39 −35 src/param.cpp
  51. +133 −135 src/rasm.cpp
  52. +777 −81 src/robo_ed.cpp
  53. +21 −10 src/robo_ed.h
  54. +136 −90 src/robot.cpp
  55. +24 −20 src/runrobo2.cpp
  56. +7 −2 src/scrdisp.cpp
  57. +4 −2 src/sfx.cpp
  58. +2 −2 src/sfx_edit.cpp
  59. +261 −139 src/window.cpp
  60. +5 −5 src/window.h
  61. +46 −9 src/world.cpp
  62. +7 −3 src/world.h
View
@@ -30,7 +30,7 @@ install:
install -o root -m 0644 mzx_blank.chr ${PREFIX}/share/megazeux && \
install -o root -m 0644 mzx_smzx.chr ${PREFIX}/share/megazeux && \
install -o root -m 0644 mzx_ascii.chr ${PREFIX}/share/megazeux && \
- install -o root -m 0644 default.spl ${PREFIX}/share/megazeux && \
+ install -o root -m 0644 smzx.pal ${PREFIX}/share/megazeux && \
install -o root -m 0644 mzx_help.fil ${PREFIX}/share/megazeux && \
install -o root -m 0644 config.txt /etc/megazeux-config && \
install -o root -m 0755 ${TARGET} ${PREFIX}/bin && \
View
@@ -2,14 +2,20 @@
# used by all makefiles
#
CC = gcc
-CPP = g++
+CXX = g++
# default target name
-TARGET = mzx280f
-VERSION = 2.80f
+TARGET = mzx280g
+VERSION = 2.80g
-# default optimisations
+ifdef DEBUG
+# debug C++ flags
+CXXFLAGS = -g -funsigned-char -Wall -DMZX_VERSION=\"${VERSION}\" -DDEBUG
+else
+# optimised C++ flags
CXXFLAGS = -O2 -funsigned-char -ffast-math -Wall -DMZX_VERSION=\"${VERSION}\"
+endif
+
CXXFLAGS += -I../contrib/libmodplug/src -I../contrib/libmodplug/src/include
CXXFLAGS += -I../contrib/gdm2s3m/src
LIBS += ../contrib/libmodplug/src/libmodplug.a
View
@@ -9,7 +9,7 @@ STRIP = strip --strip-unneeded
INCLUDES = -I${PREFIX}/include -I${PREFIX}/include/SDL
# standard libraries
-LIBS = -L$(PREFIX)/lib -lSDL -lpthread
+LIBS = -L${PREFIX}/lib -lSDL -lpthread
# install prefix
PREFIX=/usr
View
@@ -9,4 +9,4 @@ STRIP = strip --strip-unneeded
INCLUDES = -I${PREFIX}/include -I${PREFIX}/include/SDL
# standard libraries
-LIBS = -L$(PREFIX)/lib -lSDL -lpthread
+LIBS = -L${PREFIX}/lib -lSDL -lpthread
View
@@ -3,10 +3,10 @@
#
# location of strip (must be defined)
-STRIP = true
+STRIP = strip
# standard linker includes
INCLUDES = -I${PREFIX}/include -I${PREFIX}/include/SDL
# standard libraries
-LIBS = -L$(PREFIX)/lib -lSDLmain -lSDL -lpthread -framework Cocoa
+LIBS = -L${PREFIX}/lib -lSDLmain -lSDL -lpthread -framework Cocoa
View
@@ -12,4 +12,11 @@ STRIP = strip --strip-unneeded
INCLUDES = -I${PREFIX}/include -I${PREFIX}/include/SDL
# standard libraries
-LIBS = -L$(PREFIX)/lib -lmingw32 -mwindows -lSDLmain -lSDL
+LIBS = -L${PREFIX}/lib -lmingw32 -lSDLmain -lSDL
+
+# debug does something different
+ifdef DEBUG
+LIBS += -mconsole
+else
+LIBS += -mwindows
+endif
View
@@ -31,22 +31,22 @@ echo >> Makefile.platform
echo "# install prefix" >> Makefile.platform
echo "PREFIX=$PREFIX" >> Makefile.platform
-if [ "$ARCH" = "win32" ]; then
+if [ "$ARCH" = "win32" -o "$ARCH" = "macos" ]; then
echo "#define MZX_DEFAULT_CHR \"mzx_default.chr\"" > src/config.h
echo "#define MZX_BLANK_CHR \"mzx_blank.chr\"" >> src/config.h
echo "#define MZX_SMZX_CHR \"mzx_smzx.chr\"" >> src/config.h
echo "#define MZX_ASCII_CHR \"mzx_ascii.chr\"" >> src/config.h
- echo "#define DEFAULT_SPL \"default.spl\"" >> src/config.h
+ echo "#define SMZX_PAL \"smzx.pal\"" >> src/config.h
echo "#define MZX_HELP_FIL \"mzx_help.fil\"" >> src/config.h
echo "#define CONFIG_TXT \"config.txt\"" >> src/config.h
fi
-if [ "$ARCH" = "linux" -o "$ARCH" = "macos" ]; then
+if [ "$ARCH" = "linux" ]; then
echo "#define MZX_DEFAULT_CHR \"$PREFIX/share/megazeux/mzx_default.chr\"" > src/config.h
echo "#define MZX_BLANK_CHR \"$PREFIX/share/megazeux/mzx_blank.chr\"" >> src/config.h
echo "#define MZX_SMZX_CHR \"$PREFIX/share/megazeux/mzx_smzx.chr\"" >> src/config.h
echo "#define MZX_ASCII_CHR \"$PREFIX/share/megazeux/mzx_ascii.chr\"" >> src/config.h
- echo "#define DEFAULT_SPL \"$PREFIX/share/megazeux/default.spl\"" >> src/config.h
+ echo "#define SMZX_PAL \"$PREFIX/share/megazeux/smzx.pal\"" >> src/config.h
echo "#define MZX_HELP_FIL \"$PREFIX/share/megazeux/mzx_help.fil\"" >> src/config.h
echo "#define CONFIG_TXT \"/etc/megazeux-config\"" >> src/config.h
fi
View
@@ -18,7 +18,6 @@
# an explanation. If an option is not chosen at all
# this default will automatically be used.
-
### Video options ###
# Resolution MZX uses for fullscreen. Note that MZX will always
@@ -140,14 +139,42 @@
#default_invalid_status = ignore
-# Default macros that can be used in the robot editor with
-# F6 through F10.
-
-#macro_one = char\s
-#macro_two = color\s
-#macro_three = goto\s
-#macro_four = send\s
-#macro_five = :\splayershot^
+# Single line macros
+# These are the traditional MZX macros; they may only
+# occupy one line in their definition in this file. They
+# correspond to parameter-less macros: when you press
+# F6 through F10 the following strings are printed to
+# the editor, verbatim. For instance if you set macro_1 to
+# * "hello", * "hello" will be inserted every time you
+# press F6 in the robot editor.
+# The following are the default singe-line macros.
+
+#macro_1 = char\s
+#macro_2 = color\s
+#macro_3 = goto\s
+#macro_4 = send\s
+#macro_5 = :\splayershot^
+
+# Extended macros:
+# See macro.txt.
+
+# The following is an example extended macro.
+# It sets up a sprite. If you find it useful, remove the #'s.
+
+#macro_1 = Sprite\sSetup
+# (number255 spr_num)
+# (number255 w, h, rx, ry)
+# (number255 cx, cy, cw, ch)
+# (number255 x, y)
+# set spr!spr_num!_width !w!
+# set spr!spr_num!_height !h!
+# set spr!spr_num!_refx !rx!
+# set spr!spr_num!_refy !ry!
+# set spr!spr_num!_cwidth !cw!
+# set spr!spr_num!_cheight !ch!
+# set spr!spr_num!_cx !cx!
+# set spr!spr_num!_cy !cy!
+# put !x1! sprite p!#spr_num! !x! !y!
# Whether or not the palette should be reverted to default
# when the robot editor is load. If set, SMZX mode 0 will
@@ -223,4 +250,6 @@
# might cause MZX to lock up sometimes on some machines - if you have
# problems with it don't enable it.
-#pause_on_unfocus = 0
+#pause_on_unfocus = 0
+
+include Cmacro.cnf
View
@@ -14,8 +14,8 @@ SDL: http://www.libsdl.org/
libmodplug: http://prdownloads.sourceforge.net/modplug-xmms/
-gdm2s3m: http://mzx.bitpack.net/gdm2s3m-1.5-lite.tar.bz2
-(should also show up on other sites soon)
+gdm2s3m: http://mzx.bitpack.net/gdm2s3m/
+(might also show up on other sites one day)
NOTE: As of this writing, libmodplug (version 0.7) has a bug that
doesn't allow it to correctly load 2-channel FT2 saved mods. There
View
@@ -1,3 +1,59 @@
++ Fixed crash on alt + x in robot editor.
++ Fixed missing line on alt + h in robot editor.
++ Introduced incorrect enter action in robot editor (didn't reset to beginning
+ of the line), fixed.
++ Fixed garbage appearing when moving from a larger to smaller board and being
+ outside of that board's scroll region.
++ Fixed bug that could cause glitches/crashing when resizing the board
++ Fixed error with global next option not retaining the three checkmark
+ options correctly.
++ Added work around so that move block moves the player (won't move it on
+ inter-board moves)
++ Fixed bad palette loading for Linux introduced in 2.80e or f or something
++ Made it so block highlighting doesn't highlight the debug window.
++ Made the debug window move if necessary when home/end is pressed.
++ Added autorepeat buffering so previous keys can be resumed.
++ Fixed bug with swap world possibly not working (crashing??) off Windows
++ Fixed more problems with garbage/crashes when resizing with the cursor
+ in a position causing the scroll to go off the edge
++ Fixed incorrect text cursor offset with force_height_multiplier on.
++ Redid way directories are loaded internally so you can load dirs with over
+ 4096 entries now. Might be faster (unsure)
++ Chest contents list menu looked funny, fixed.
++ Changed default.spl to smzx.pal so you can load it more sanely.
++ Export block wasn't getting the last selected line. Fixed.
++ Hacked scroll editor so it wouldn't crash when removing lines. Scroll code
+ either needs to be 100% overhauled or replaced by robots somehow...
++ Fixed config files not being closed.
++ Added include file option for config files. Use it like this:
+ include configfile e.g. include subconfig.cnf will load subconfig.cnf's
+ options
++ Fixed freadN not terminating strings.
++ Fixed graphical glitch when using the mouse in the char selector.
++ Fixed save games crashing when they can't load fopened files.
++ Fixed some other problems with save games and fopened files...
++ Accidentally had title screen running a bit slow...
++ Value strings starting with ( not parsed as an expression if they
+ don't end with the )
++ Fixed problem with key_code being triggered for keys that aren't
+ in-game
++ Removed the unimplemented if player dir and if not player dir
+ commands from RASM
++ Added extended macros. This allows for parameter based macros to
+ be entered in the robot editor via a window or by command. See
+ macro.txt for more information.
++ Fixed player cloning after flip/mirror and player placing.
++ Added random seeding that was mysteriously missing...
++ Finally added drive changing for Windows builds.
++ Fixed mousex/mousey for resolutions other than 640x350 (only applies to
+ fullscreen)
++ Fixed crash on weird invalid death/endgame boards...
++ % and & messages clip correctly now.
++ Fixed potential crash on double closing the files.
++ Fixed crash bugs with placing sensors and maybe scrolls.
++ Fixed sending sensors when you have robots of the same name (fixes
+ Weirdness chapter 1)
+
December 26, 2004 - MZX 2.80f
+ Fixed a bug that could cause crashes when auto-quoting params in the robot
@@ -76,7 +132,7 @@ December 19, 2004 - MZX 2.80e
+ Added save/load position to the editor. Works for loads inbetween boards as
well. Press ctrl + num to save to slots 0 through 9 and alt + num to load from
that slot. Please press shift + 8 or the numpad * key instead of alt + 8 to
- set mod wildcard.
+ set mod wildcard.
+ MZX now ignores the mouse scroll wheel instead of interpreting it as a click.
+ Fixed a further bug that could cause playing samples to crash.
+ Added config file option to revert the robot editor to the default palette
Oops, something went wrong.

0 comments on commit 98c1ee0

Please sign in to comment.