Permalink
Browse files

MegaZeux 2.80e release.

  • Loading branch information...
1 parent 8ab51ab commit 837aa5de0d4c903af2fff99125c1cbdc9f47abae @ajs1984 committed Aug 11, 2008
Showing with 51,391 additions and 48,812 deletions.
  1. +0 −48 MZX270w_Bugs.txt
  2. +32 −31 Makefile
  3. +21 −0 Makefile.in
  4. +0 −43 Makefile.linux
  5. +15 −0 Makefile.platform
  6. +12 −0 arch/Makefile.linux
  7. +12 −0 arch/Makefile.macos
  8. +15 −0 arch/Makefile.win32
  9. +54 −0 config.sh
  10. +79 −3 config.txt
  11. +1 −1 contrib/gdm2s3m/src/Makefile
  12. +1 −1 contrib/libmodplug/src/Makefile
  13. +0 −46 cursor.h
  14. +8 −6 { → docs}/COPYING.DOC
  15. 0 { → docs}/betatest.txt
  16. +1 −1 { → docs}/build.txt
  17. +62 −0 { → docs}/changelog.txt
  18. 0 { → docs}/coms.txt
  19. 0 { → docs}/convmem.txt
  20. 0 { → docs}/counter_list.txt
  21. 0 { → docs}/develop.txt
  22. 0 { → docs}/filef200.txt
  23. 0 { → docs}/filef268.txt
  24. 0 { → docs}/fileform.txt
  25. 0 { → docs}/fix.doc
  26. 0 { → docs}/help.doc
  27. 0 { → docs}/info_mzx.txt
  28. 0 { → docs}/megazeux.doc
  29. 0 { → docs}/mzm.txt
  30. 0 { → docs}/port.txt
  31. 0 { → docs}/readme.txt
  32. 0 { → docs}/to_add.txt
  33. BIN mzx_help.fil
  34. +0 −88 robo_ed.h
  35. +0 −36 scrdump.h
  36. +24 −0 src/Makefile
  37. +593 −589 { → src}/audio.cpp
  38. +78 −78 { → src}/audio.h
  39. +311 −311 { → src}/block.cpp
  40. +37 −37 { → src}/block.h
  41. +960 −958 { → src}/board.cpp
  42. +117 −117 { → src}/board.h
  43. +847 −847 { → src}/char_ed.cpp
  44. +30 −30 { → src}/char_ed.h
  45. +29 −29 { → src}/charset.h
  46. +7 −0 src/config.h
  47. +590 −509 { → src}/configure.cpp
  48. +80 −74 { → src}/configure.h
  49. +126 −126 { → src}/const.h
  50. +2,928 −2,929 { → src}/counter.cpp
  51. +131 −129 { → src}/counter.h
  52. 0 { → src}/counter_first_letter.h
  53. +319 −319 { → src}/data.cpp
  54. +71 −71 { → src}/data.h
  55. +201 −196 { → src}/decrypt.cpp
  56. +29 −29 { → src}/decrypt.h
  57. +35 −35 { → src}/delay.cpp
  58. +28 −28 { → src}/delay.h
  59. +3,108 −3,090 { → src}/edit.cpp
  60. +73 −73 { → src}/edit.h
  61. +1,510 −1,496 { → src}/edit_di.cpp
  62. +39 −37 { → src}/edit_di.h
  63. +184 −184 { → src}/error.cpp
  64. +35 −35 { → src}/error.h
  65. +864 −697 { → src}/event.cpp
  66. +100 −87 { → src}/event.h
  67. +519 −519 { → src}/expr.cpp
  68. +36 −36 { → src}/expr.h
  69. +395 −395 { → src}/fill.cpp
  70. +31 −31 { → src}/fill.h
  71. +226 −226 { → src}/fix.cpp
  72. +3 −3 { → src}/fsafeopen.cpp
  73. +33 −33 { → src}/fsafeopen.h
  74. +3,516 −3,514 { → src}/game.cpp
  75. +73 −73 { → src}/game.h
  76. +2,749 −2,748 { → src}/game2.cpp
  77. +49 −49 { → src}/game2.h
  78. +225 −225 { → src}/getpw.cpp
  79. +1,509 −1,484 { → src}/graphics.cpp
  80. +152 −150 { → src}/graphics.h
  81. +123 −123 { → src}/helpsys.cpp
  82. +34 −34 { → src}/helpsys.h
  83. +73 −73 { → src}/hexchar.cpp
  84. +31 −31 { → src}/hexchar.h
  85. +147 −147 { → src}/idarray.cpp
  86. +39 −39 { → src}/idarray.h
  87. +677 −677 { → src}/idput.cpp
  88. +39 −39 { → src}/idput.h
  89. +656 −651 { → src}/intake.cpp
  90. +40 −40 { → src}/intake.h
  91. +82 −82 { → src}/killgbl.cpp
  92. +130 −124 { → src}/main.cpp
  93. +30 −30 { → src}/main.h
  94. +1,751 −0 src/mmgr.cpp
  95. +167 −0 src/mmgr.h
  96. +589 −589 { → src}/mzm.cpp
  97. +32 −32 { → src}/mzm.h
  98. +60 −0 src/nommgr.h
  99. +306 −306 { → src}/pal_ed.cpp
  100. +29 −29 { → src}/pal_ed.h
  101. +1,315 −1,315 { → src}/param.cpp
  102. +65 −65 { → src}/param.h
  103. +138 −138 { → src}/password.cpp
  104. +41 −41 { → src}/password.h
  105. +2,461 −2,461 { → src}/rasm.cpp
  106. +199 −199 { → src}/rasm.h
  107. +1,961 −1,981 { → src}/robo_ed.cpp
  108. +104 −0 src/robo_ed.h
  109. +2,850 −2,827 { → src}/robot.cpp
  110. +257 −257 { → src}/robot.h
  111. +5,597 −5,587 { → src}/runrobo2.cpp
  112. +774 −774 { → src}/scrdisp.cpp
  113. +42 −42 { → src}/scrdisp.h
  114. +380 −380 { → src}/sfx.cpp
  115. +68 −68 { → src}/sfx.h
  116. +255 −255 { → src}/sfx_edit.cpp
  117. +32 −32 { → src}/sfx_edit.h
  118. +681 −679 { → src}/sprite.cpp
  119. +89 −89 { → src}/sprite.h
  120. +83 −83 { → src}/struct.h
  121. +403 −403 { → src}/txt2hlp.cpp
  122. +1,109 −1,109 { → src}/ver1to2.cpp
  123. +2,145 −2,103 { → src}/window.cpp
  124. +189 −189 { → src}/window.h
  125. +1,610 −1,565 { → src}/world.cpp
  126. +195 −194 { → src}/world.h
View
@@ -1,48 +0,0 @@
-In general:
- * These crashes are doing weird things to my monitor. It's now
- continually making minute resizes on the horizontal aspect, even
- though the program is crashed and closed. There, it just did it
- again!
-
-In Caverns:
- * Fish in the fountain seem to be abnormally "intelligent" in their
- following patterns. They get in the way a lot more than I remember
- them doing.
- * The rainbow bridge does not appear when all the gems are collected.
- There is a character change to reflect the gem placement, and a
- flash of light, but no bridge.
-
-In Demon Earth:
- * Game will often crash on start. I suspect this may have something
- to do with the way Nytar forced all four game files to load up the
- starting world when played, since it seems to work when you play
- from the world DE_START. However, this is only conjecture.
- * Fade in after room transition doesn't look right, there is a bright
- flash of the room before it goes back to dark and fades up.
- * Name selection still doesn't work, and hasn't since 2.69c. The
- player is always called "Player". This may be the fault of bad
- coding taking improper advantage of a 2.69b bug.
- * When arriving on Earth, I'm not sure the character set changed
- correctly; when I went over to the boulders blocking the east passage
- they looked like a type of game enemy, not boulders.
- * Upon touching the boulders, the game crashed to desktop.
- * There is clearly a problem with the status bar that is hard to
- diagnose. It appears that it somehow gets uncoupled from tracking
- energy and health, perhaps on getting a power up. All I could tell
- was that the numbers were stuck at full (I initially thought
- something was broken so that I had infinite ammo), but when I kept
- firing shots I eventually drained both my energy and my health and
- died.
- * Loading an old version's save game (just to check) crashed the
- program with a "Windowing Code Bug". I know this isn't supported
- functionality, and didn't expect it to be, but it would be nice if
- it failed gracefully with a "Save game is from a previous version"
- error, instead of a fatal crash.
-
-In Rayne's Jellybean:
- * The game is entirely unplayable, the characters on the game screen
- are a bunch of garbage, and while the basic shape is apparent by the
- colors, the only legible things are the four answers.
- * I can't tell for sure, but if I remember what the keys are for
- selecting answers are, then they aren't working, and cause no
- response.
View
@@ -1,36 +1,37 @@
-# MZX makefile
+#
+# Slave MegaZeux makefile
+#
+include Makefile.platform
+include Makefile.in
-OBJS = main.o graphics.o window.o hexchar.o event.o \
- error.o helpsys.o world.o board.o robot.o idput.o \
- intake.o sfx.o scrdisp.o data.o game.o counter.o \
- idarray.o delay.o game2.o expr.o sprite.o runrobo2.o \
- mzm.o decrypt.o audio.o edit.o edit_di.o block.o \
- char_ed.o pal_ed.o param.o sfx_edit.o fill.o rasm.o \
- robo_ed.o configure.o
+SUBDIRS = contrib/gdm2s3m/src contrib/libmodplug/src src
-PREFIX = /usr
+all: subdir
-BIN = mzx280d.exe
-
-CC = gcc
-CPP = g++
-STRIP = strip
-CFLAGS = -mconsole -O2 -funsigned-char -ffast-math
-INCLUDES = -I$(PREFIX)/include -I$(PREFIX)/include/SDL
-
-LIBS = -L$(PREFIX)/lib -lmingw32 -lSDLmain -lSDL -lmodplug -lgdm2s3m
-
-.SUFFIXES: .cpp
-
-%.o: %.cpp
- ${CPP} ${CFLAGS} ${INCLUDES} -c $<
-
-all: mzx
-
-mzx: ${OBJS}
- ${CPP} ${OBJS} ${LIBS} -o ${BIN}
- ${STRIP} --strip-all ${BIN}
+subdir:
+ list='$(SUBDIRS)'; \
+ for subdir in $$list; do \
+ pwd=`pwd`; \
+ cd $$subdir && make && cd $$pwd; \
+ done;
clean:
- rm -f *.o ${BIN}
-
+ list='$(SUBDIRS)'; \
+ for subdir in $$list; do \
+ pwd=`pwd`; \
+ cd $$subdir && make clean && cd $$pwd; \
+ done;
+
+install:
+ mkdir -p ${PREFIX}/share/megazeux && \
+ chown root:root ${PREFIX}/share/megazeux && \
+ chmod 0755 ${PREFIX}/share/megazeux && \
+ install -o root -m 0644 mzx_default.chr ${PREFIX}/share/megazeux && \
+ 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 mzx_help.fil ${PREFIX}/share/megazeux && \
+ install -o root -m 0644 config.txt /etc/megazeux-config && \
+ install -o root -m 0755 ${TARGET} ${PREFIX}/bin && \
+ ln -sf ${TARGET} ${PREFIX}/bin/megazeux
View
@@ -0,0 +1,21 @@
+#
+# used by all makefiles
+#
+CC = gcc
+CPP = g++
+
+# default target name
+TARGET = mzx280e
+VERSION = 2.80e
+
+# default optimisations
+CXXFLAGS = -O2 -funsigned-char -ffast-math -Wall -DMZX_VERSION=\"${VERSION}\"
+CXXFLAGS += -I../contrib/libmodplug/src -I../contrib/libmodplug/src/include
+CXXFLAGS += -I../contrib/gdm2s3m/src
+LIBS += ../contrib/libmodplug/src/libmodplug.a
+LIBS += ../contrib/gdm2s3m/src/libgdm2s3m.a
+
+.SUFFIXES: .cpp
+
+%.o: %.cpp
+ ${CXX} ${CXXFLAGS} ${INCLUDES} -c $<
View
@@ -1,43 +0,0 @@
-# MZX makefile
-
-OBJS = main.o graphics.o window.o hexchar.o event.o \
- error.o helpsys.o world.o board.o robot.o idput.o \
- intake.o sfx.o scrdisp.o data.o game.o counter.o \
- idarray.o delay.o game2.o expr.o sprite.o runrobo2.o \
- mzm.o decrypt.o audio.o edit.o edit_di.o block.o \
- char_ed.o pal_ed.o param.o sfx_edit.o fill.o rasm.o \
- robo_ed.o configure.o fsafeopen.o
-
-PREFIX = /usr
-
-BIN = mzx280d
-
-CC = gcc
-CPP = g++
-STRIP = strip
-CFLAGS = -O2 -funsigned-char -ffast-math
-INCLUDES = -I$(PREFIX)/include/SDL
-INCLUDES += -Icontrib/libmodplug/src -Icontrib/libmodplug/src/include
-INCLUDES += -Icontrib/gdm2s3m/src
-
-LIBS = -lSDL -lpthread
-LIBS += contrib/gdm2s3m/src/libgdm2s3m.a
-LIBS += contrib/libmodplug/src/libmodplug.a
-
-.SUFFIXES: .cpp
-
-%.o: %.cpp
- ${CPP} ${CFLAGS} ${INCLUDES} -c $<
-
-all: mzx
-
-mzx: ${OBJS}
- ${MAKE} -fcontrib/gdm2s3m/src/Makefile
- ${MAKE} -fcontrib/libmodplug/src/Makefile
- ${CPP} ${OBJS} ${LIBS} -o ${BIN}
- ${STRIP} --strip-all ${BIN}
-
-clean:
- ${MAKE} -fcontrib/gdm2s3m/src/Makefile clean
- ${MAKE} -fcontrib/libmodplug/src/Makefile clean
- rm -f *.o ${BIN}
View
@@ -0,0 +1,15 @@
+#
+# linux makefile generics
+#
+
+# location of strip (must be defined)
+STRIP = strip --strip-unneeded
+
+# standard linker includes
+INCLUDES = -I${PREFIX}/include -I${PREFIX}/include/SDL
+
+# standard libraries
+LIBS = -L$(PREFIX)/lib -lSDL -lpthread
+
+# install prefix
+PREFIX=/usr
View
@@ -0,0 +1,12 @@
+#
+# linux makefile generics
+#
+
+# location of strip (must be defined)
+STRIP = strip --strip-unneeded
+
+# standard linker includes
+INCLUDES = -I${PREFIX}/include -I${PREFIX}/include/SDL
+
+# standard libraries
+LIBS = -L$(PREFIX)/lib -lSDL -lpthread
View
@@ -0,0 +1,12 @@
+#
+# macos makefile generics
+#
+
+# location of strip (must be defined)
+STRIP = true
+
+# standard linker includes
+INCLUDES = -I${PREFIX}/include -I${PREFIX}/include/SDL
+
+# standard libraries
+LIBS = -L$(PREFIX)/lib -lSDL -lpthread
View
@@ -0,0 +1,15 @@
+#
+# win32 makefile generics
+#
+
+# windows requires a binary extension
+BINEXT = .exe
+
+# location of strip (must be defined)
+STRIP = strip --strip-unneeded
+
+# standard linker includes
+INCLUDES = -I${PREFIX}/include -I${PREFIX}/include/SDL
+
+# standard libraries
+LIBS = -L$(PREFIX)/lib -lmingw32 -mwindows -lSDLmain -lSDL
View
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+if [ "$1" = "" ]; then
+ if [ "`uname -o`" = "GNU/Linux" ]; then
+ echo "Assuming Linux operating system.."
+ cp -f arch/Makefile.linux Makefile.platform
+ ARCH=linux
+ else
+ echo "Assuming Windows operating system.."
+ cp -f arch/Makefile.win32 Makefile.platform
+ ARCH=win32
+ fi
+else
+ cp -f arch/Makefile.$1 Makefile.platform
+ ARCH=$1
+fi
+
+if [ ! -f Makefile.platform ]; then
+ echo "Invalid platform selection (see arch/)"
+ exit 1
+fi
+
+if [ "$2" = "" ]; then
+ echo "Assuming /usr prefix.."
+ PREFIX=/usr
+else
+ PREFIX=$2
+fi
+
+echo >> Makefile.platform
+echo "# install prefix" >> Makefile.platform
+echo "PREFIX=$PREFIX" >> Makefile.platform
+
+if [ "$ARCH" = "win32" ]; 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 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
+ 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 MZX_HELP_FIL \"$PREFIX/share/megazeux/mzx_help.fil\"" >> src/config.h
+ echo "#define CONFIG_TXT \"/etc/megazeux-config\"" >> src/config.h
+fi
+
+echo "All done!"
Oops, something went wrong.

0 comments on commit 837aa5d

Please sign in to comment.