[SCM] asciiportal - a puzzle jump'n'run adventure game branch, master, updated. upstream/1.2c-2-g07cb890
Peter Pentchev
roam at ringlet.net
Sat Sep 11 22:22:20 UTC 2010
The following commit has been merged in the master branch:
commit 07cb890f7299f64d7e13d87fb33e270fc3bda0f1
Author: Peter Pentchev <roam at ringlet.net>
Date: Sun Sep 12 01:21:44 2010 +0300
Argh, fold an unrefreshed change back into the quilt patch.
diff --git a/debian/patches/01-Makefile.patch b/debian/patches/01-Makefile.patch
index 9db428e..1c583a0 100644
--- a/debian/patches/01-Makefile.patch
+++ b/debian/patches/01-Makefile.patch
@@ -35,7 +35,7 @@ Last-Modified: 2010-09-11
-asciiportal: al_input.o ap_draw.o ap_play.o ap_sound.o main.o menu.o $(PDCSDLDIR)/sdl1/libpdcurses.a
- g++ $^ -lSDL -lSDL_mixer -o $@
+asciiportal: $(OBJS)
-+ g++ $(LDFLAGS) -o $@ $(OBJS) -lXCurses -lSDL -lSDL_mixer
++ g++ $(LDFLAGS) -o $@ $(OBJS) -lpdcurses `xcurses-config --libs` -lSDL -lSDL_mixer
$(PDCSDLDIR)/sdl1/libpdcurses.a: $(PDCSDLDIR)
cd `dirname $@` && make
diff --git a/debian/patches/debian-changes-1.2c-1 b/debian/patches/debian-changes-1.2c-1
deleted file mode 100644
index 5de897d..0000000
--- a/debian/patches/debian-changes-1.2c-1
+++ /dev/null
@@ -1,289 +0,0 @@
-Description: Upstream changes introduced in version 1.2c-1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- asciiportal (1.2c-1) UNRELEASED; urgency=low
- .
- WAITSFOR: libxcurses (ITP #548070)
- .
- TODO: teach the binary about /usr/share/asciiportal
- TODO: write a manpage
- TODO: break out the common stuff into asciiportal-common
- TODO: remove the unneeded dh_make template files
- TODO: policy 3.9.1
- TODO: dpkg-buildflags
- TODO: debhelper 8
- TODO: DEP 5 copyright
- TODO: DEP 3 patches
- TODO: Vcs-* tags
- TODO: appease lintian
- TODO: wait for the Squeeze freeze to end :)
- .
- * Initial release (Closes: #548031)
- .
- The person named in the Author field signed this changelog entry.
-Author: Peter Pentchev <roam at ringlet.net>
-Bug-Debian: http://bugs.debian.org/548031
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- asciiportal-1.2c.orig/ASCIIpOrtal-linux-Makefile.txt
-+++ asciiportal-1.2c/ASCIIpOrtal-linux-Makefile.txt
-@@ -39,7 +39,7 @@ package: fullclean asciiportal
- g++ -c $(GPPOPTS) $<
-
- asciiportal: $(OBJS)
-- g++ $(LDFLAGS) -o $@ $(OBJS) -lXCurses -lSDL -lSDL_mixer
-+ g++ $(LDFLAGS) -o $@ $(OBJS) -lpdcurses `xcurses-config --libs` -lSDL -lSDL_mixer
-
- $(PDCSDLDIR)/sdl1/libpdcurses.a: $(PDCSDLDIR)
- cd `dirname $@` && make
---- /dev/null
-+++ asciiportal-1.2c/tags
-@@ -0,0 +1,234 @@
-+!_TAG_FILE_FORMAT 2 /extended format; --format=1 will not append ;" to lines/
-+!_TAG_FILE_SORTED 1 /0=unsorted, 1=sorted, 2=foldcase/
-+!_TAG_PROGRAM_AUTHOR Darren Hiebert /dhiebert at users.sourceforge.net/
-+!_TAG_PROGRAM_NAME Exuberant Ctags //
-+!_TAG_PROGRAM_URL http://ctags.sourceforge.net /official site/
-+!_TAG_PROGRAM_VERSION 5.8 //
-+AP_DRAW_H_INCLUDED ap_draw.h 26;" d
-+AP_INPUT_H_INCLUDED ap_input.h 26;" d
-+AP_PLAY_H_INCLUDED ap_play.h 26;" d
-+AP_SOUND_H_INCLUDED ap_sound.h 26;" d
-+ASCIIPORTAL_H_INCLUDED asciiportal.h 26;" d
-+BOULDER asciiportal.h /^ BOX, BOULDER, PLAYER, TEXTTRIGGER, FLASH,$/;" e enum:GameObjs
-+BOX asciiportal.h /^ BOX, BOULDER, PLAYER, TEXTTRIGGER, FLASH,$/;" e enum:GameObjs
-+CRUSH ap_sound.h /^ SILENT, WIN, SIZZLE, PORTALCOLLAPSE, CRUSH, SWITCHHIT, DOOROPEN, DOORCLOSE, DUPLICATE,$/;" e enum:Sounds
-+CharData .pc/01-Makefile.patch/ap_draw.cpp /^int CharData [MAXColors][5] = \/\/ File, Screen, Forground, background, A_BOLD$/;" v
-+CharData ap_draw.cpp /^int CharData [MAXColors][5] = \/\/ File, Screen, Forground, background, A_BOLD$/;" v
-+DOOR asciiportal.h /^ SWITCH, SWITCHON, DOOR, DOOR3, DOOR2, DOOR1,$/;" e enum:GameObjs
-+DOOR1 asciiportal.h /^ SWITCH, SWITCHON, DOOR, DOOR3, DOOR2, DOOR1,$/;" e enum:GameObjs
-+DOOR2 asciiportal.h /^ SWITCH, SWITCHON, DOOR, DOOR3, DOOR2, DOOR1,$/;" e enum:GameObjs
-+DOOR3 asciiportal.h /^ SWITCH, SWITCHON, DOOR, DOOR3, DOOR2, DOOR1,$/;" e enum:GameObjs
-+DOORCLOSE ap_sound.h /^ SILENT, WIN, SIZZLE, PORTALCOLLAPSE, CRUSH, SWITCHHIT, DOOROPEN, DOORCLOSE, DUPLICATE,$/;" e enum:Sounds
-+DOOROPEN ap_sound.h /^ SILENT, WIN, SIZZLE, PORTALCOLLAPSE, CRUSH, SWITCHHIT, DOOROPEN, DOORCLOSE, DUPLICATE,$/;" e enum:Sounds
-+DUPLICATE ap_sound.h /^ SILENT, WIN, SIZZLE, PORTALCOLLAPSE, CRUSH, SWITCHHIT, DOOROPEN, DOORCLOSE, DUPLICATE,$/;" e enum:Sounds
-+DUPLICATOR asciiportal.h /^ DUPLICATOR, SHOT1, SHOT2, PORTAL1, PORTAL2,$/;" e enum:GameObjs
-+FFIELD asciiportal.h /^ FFIELD, PFIELD, XFIELD, SPIKE,$/;" e enum:GameObjs
-+FLASH asciiportal.h /^ BOX, BOULDER, PLAYER, TEXTTRIGGER, FLASH,$/;" e enum:GameObjs
-+GOAL asciiportal.h /^ NONE, GOAL, LADDER, NORMAL, NONSTICK, LTREAD, RTREAD,$/;" e enum:GameObjs
-+GUNSHOT ap_sound.h /^ MENUBEEP, MENUCHOICE, GUNSHOT, PORTALCREATE, PORTALFAIL, THROUGH,$/;" e enum:Sounds
-+GameObjs asciiportal.h /^enum GameObjs {$/;" g
-+HELPMENU asciiportal.h /^ PAUSE, MENUDIM, MENUSELECT, HELPMENU, TEXTFIELD,$/;" e enum:GameObjs
-+LADDER asciiportal.h /^ NONE, GOAL, LADDER, NORMAL, NONSTICK, LTREAD, RTREAD,$/;" e enum:GameObjs
-+LTREAD asciiportal.h /^ NONE, GOAL, LADDER, NORMAL, NONSTICK, LTREAD, RTREAD,$/;" e enum:GameObjs
-+MAXColors asciiportal.h /^ MAXColors$/;" e enum:GameObjs
-+MAXObjects asciiportal.h /^ MAXObjects, \/\/ defined for ease of reference$/;" e enum:GameObjs
-+MAXSound ap_sound.h /^ MAXSound$/;" e enum:Sounds
-+MAXWall asciiportal.h /^ MAXWall,$/;" e enum:GameObjs
-+MENUBEEP ap_sound.h /^ MENUBEEP, MENUCHOICE, GUNSHOT, PORTALCREATE, PORTALFAIL, THROUGH,$/;" e enum:Sounds
-+MENUCHOICE ap_sound.h /^ MENUBEEP, MENUCHOICE, GUNSHOT, PORTALCREATE, PORTALFAIL, THROUGH,$/;" e enum:Sounds
-+MENUDIM asciiportal.h /^ PAUSE, MENUDIM, MENUSELECT, HELPMENU, TEXTFIELD,$/;" e enum:GameObjs
-+MENUSELECT asciiportal.h /^ PAUSE, MENUDIM, MENUSELECT, HELPMENU, TEXTFIELD,$/;" e enum:GameObjs
-+MENU_H_INCLUDED menu.h 26;" d
-+NONE asciiportal.h /^ NONE, GOAL, LADDER, NORMAL, NONSTICK, LTREAD, RTREAD,$/;" e enum:GameObjs
-+NONSTICK asciiportal.h /^ NONE, GOAL, LADDER, NORMAL, NONSTICK, LTREAD, RTREAD,$/;" e enum:GameObjs
-+NORMAL asciiportal.h /^ NONE, GOAL, LADDER, NORMAL, NONSTICK, LTREAD, RTREAD,$/;" e enum:GameObjs
-+PAUSE asciiportal.h /^ PAUSE, MENUDIM, MENUSELECT, HELPMENU, TEXTFIELD,$/;" e enum:GameObjs
-+PAUSE menu.cpp 43;" d file:
-+PFIELD asciiportal.h /^ FFIELD, PFIELD, XFIELD, SPIKE,$/;" e enum:GameObjs
-+PLAYER asciiportal.h /^ BOX, BOULDER, PLAYER, TEXTTRIGGER, FLASH,$/;" e enum:GameObjs
-+PORTAL1 asciiportal.h /^ DUPLICATOR, SHOT1, SHOT2, PORTAL1, PORTAL2,$/;" e enum:GameObjs
-+PORTAL2 asciiportal.h /^ DUPLICATOR, SHOT1, SHOT2, PORTAL1, PORTAL2,$/;" e enum:GameObjs
-+PORTALCOLLAPSE ap_sound.h /^ SILENT, WIN, SIZZLE, PORTALCOLLAPSE, CRUSH, SWITCHHIT, DOOROPEN, DOORCLOSE, DUPLICATE,$/;" e enum:Sounds
-+PORTALCREATE ap_sound.h /^ MENUBEEP, MENUCHOICE, GUNSHOT, PORTALCREATE, PORTALFAIL, THROUGH,$/;" e enum:Sounds
-+PORTALFAIL ap_sound.h /^ MENUBEEP, MENUCHOICE, GUNSHOT, PORTALCREATE, PORTALFAIL, THROUGH,$/;" e enum:Sounds
-+RTREAD asciiportal.h /^ NONE, GOAL, LADDER, NORMAL, NONSTICK, LTREAD, RTREAD,$/;" e enum:GameObjs
-+SHOT1 asciiportal.h /^ DUPLICATOR, SHOT1, SHOT2, PORTAL1, PORTAL2,$/;" e enum:GameObjs
-+SHOT2 asciiportal.h /^ DUPLICATOR, SHOT1, SHOT2, PORTAL1, PORTAL2,$/;" e enum:GameObjs
-+SILENT ap_sound.h /^ SILENT, WIN, SIZZLE, PORTALCOLLAPSE, CRUSH, SWITCHHIT, DOOROPEN, DOORCLOSE, DUPLICATE,$/;" e enum:Sounds
-+SIZZLE ap_sound.h /^ SILENT, WIN, SIZZLE, PORTALCOLLAPSE, CRUSH, SWITCHHIT, DOOROPEN, DOORCLOSE, DUPLICATE,$/;" e enum:Sounds
-+SPIKE asciiportal.h /^ FFIELD, PFIELD, XFIELD, SPIKE,$/;" e enum:GameObjs
-+SWITCH asciiportal.h /^ SWITCH, SWITCHON, DOOR, DOOR3, DOOR2, DOOR1,$/;" e enum:GameObjs
-+SWITCHHIT ap_sound.h /^ SILENT, WIN, SIZZLE, PORTALCOLLAPSE, CRUSH, SWITCHHIT, DOOROPEN, DOORCLOSE, DUPLICATE,$/;" e enum:Sounds
-+SWITCHON asciiportal.h /^ SWITCH, SWITCHON, DOOR, DOOR3, DOOR2, DOOR1,$/;" e enum:GameObjs
-+Sounds ap_sound.h /^enum Sounds {$/;" g
-+TEXTFIELD asciiportal.h /^ PAUSE, MENUDIM, MENUSELECT, HELPMENU, TEXTFIELD,$/;" e enum:GameObjs
-+TEXTTRIGGER asciiportal.h /^ BOX, BOULDER, PLAYER, TEXTTRIGGER, FLASH,$/;" e enum:GameObjs
-+THROUGH ap_sound.h /^ MENUBEEP, MENUCHOICE, GUNSHOT, PORTALCREATE, PORTALFAIL, THROUGH,$/;" e enum:Sounds
-+VOICE ap_sound.h /^ VOICE, VOICE2, VOICE3, VOICE4, VOICE5, VOICE6, VOICE7, VOICE8, VOICE9, VOICE0,$/;" e enum:Sounds
-+VOICE0 ap_sound.h /^ VOICE, VOICE2, VOICE3, VOICE4, VOICE5, VOICE6, VOICE7, VOICE8, VOICE9, VOICE0,$/;" e enum:Sounds
-+VOICE2 ap_sound.h /^ VOICE, VOICE2, VOICE3, VOICE4, VOICE5, VOICE6, VOICE7, VOICE8, VOICE9, VOICE0,$/;" e enum:Sounds
-+VOICE3 ap_sound.h /^ VOICE, VOICE2, VOICE3, VOICE4, VOICE5, VOICE6, VOICE7, VOICE8, VOICE9, VOICE0,$/;" e enum:Sounds
-+VOICE4 ap_sound.h /^ VOICE, VOICE2, VOICE3, VOICE4, VOICE5, VOICE6, VOICE7, VOICE8, VOICE9, VOICE0,$/;" e enum:Sounds
-+VOICE5 ap_sound.h /^ VOICE, VOICE2, VOICE3, VOICE4, VOICE5, VOICE6, VOICE7, VOICE8, VOICE9, VOICE0,$/;" e enum:Sounds
-+VOICE6 ap_sound.h /^ VOICE, VOICE2, VOICE3, VOICE4, VOICE5, VOICE6, VOICE7, VOICE8, VOICE9, VOICE0,$/;" e enum:Sounds
-+VOICE7 ap_sound.h /^ VOICE, VOICE2, VOICE3, VOICE4, VOICE5, VOICE6, VOICE7, VOICE8, VOICE9, VOICE0,$/;" e enum:Sounds
-+VOICE8 ap_sound.h /^ VOICE, VOICE2, VOICE3, VOICE4, VOICE5, VOICE6, VOICE7, VOICE8, VOICE9, VOICE0,$/;" e enum:Sounds
-+VOICE9 ap_sound.h /^ VOICE, VOICE2, VOICE3, VOICE4, VOICE5, VOICE6, VOICE7, VOICE8, VOICE9, VOICE0,$/;" e enum:Sounds
-+WIN ap_sound.h /^ SILENT, WIN, SIZZLE, PORTALCOLLAPSE, CRUSH, SWITCHHIT, DOOROPEN, DOORCLOSE, DUPLICATE,$/;" e enum:Sounds
-+XFIELD asciiportal.h /^ FFIELD, PFIELD, XFIELD, SPIKE,$/;" e enum:GameObjs
-+XY asciiportal.h /^class XY { \/\/ very simple class for keeping XY cooridnate pairs.$/;" c
-+alt .pc/01-Makefile.patch/ap_input.cpp /^ unsigned short alt;$/;" m struct:__anon2 file:
-+alt ap_input.cpp /^ unsigned short alt;$/;" m struct:__anon1 file:
-+ambience ap_sound.cpp /^Mix_Music* ambience;$/;" v
-+animateportal .pc/01-Makefile.patch/ap_draw.cpp /^int animateportal = 0;$/;" v
-+animateportal ap_draw.cpp /^int animateportal = 0;$/;" v
-+applyd ap_play.cpp /^int applyd (int c) {$/;" f
-+beatsperdupe ap_play.cpp /^const int beatsperdupe = 15;$/;" v
-+beatspermove ap_play.cpp /^const int beatspermove = 2;$/;" v
-+beatspersecond ap_play.cpp /^int beatspersecond[6] = {0, 4, 7, 10, 15, 20};$/;" v
-+boulderbeats ap_play.cpp /^const int boulderbeats = 2;$/;" v
-+chartoscreen menu.cpp /^int chartoscreen(char o) {$/;" f
-+cheatview .pc/01-Makefile.patch/ap_draw.cpp /^int cheatview = 2;$/;" v
-+cheatview ap_draw.cpp /^int cheatview = 2;$/;" v
-+clear asciiportal.h /^ void clear() {$/;" f class:statstype
-+collapse_portals ap_play.cpp /^int collapse_portals () {$/;" f
-+color_pair .pc/01-Makefile.patch/ap_draw.cpp /^int color_pair(int obj) {$/;" f
-+color_pair ap_draw.cpp /^int color_pair(int obj) {$/;" f
-+control .pc/01-Makefile.patch/ap_input.cpp /^ unsigned short control;$/;" m struct:__anon2 file:
-+control ap_input.cpp /^ unsigned short control;$/;" m struct:__anon1 file:
-+coord asciiportal.h /^ XY coord;$/;" m class:object
-+current_music ap_sound.cpp /^string current_music = music_files[0];$/;" v
-+d asciiportal.h /^ XY d;$/;" m class:object
-+default_ambience ap_sound.cpp /^int default_ambience (int selection) {$/;" f
-+defaultspeed ap_play.cpp /^const int defaultspeed = 3;$/;" v
-+deinit_sound ap_sound.cpp /^void deinit_sound () {$/;" f
-+delay .pc/01-Makefile.patch/ap_input.cpp /^int delay = 0;$/;" v
-+delay ap_input.cpp /^int delay = 0;$/;" v
-+displaystats .pc/01-Makefile.patch/ap_draw.cpp /^int displaystats (statstype stats, int level) {$/;" f
-+displaystats ap_draw.cpp /^int displaystats (statstype stats, int level) {$/;" f
-+draw_rotate .pc/01-Makefile.patch/ap_draw.cpp /^void draw_rotate (int player, int num) { \/\/ num is the number of 90 degree rotations necessary;$/;" f
-+draw_rotate ap_draw.cpp /^void draw_rotate (int player, int num) { \/\/ num is the number of 90 degree rotations necessary;$/;" f
-+draw_screen .pc/01-Makefile.patch/ap_draw.cpp /^void draw_screen (int player) {$/;" f
-+draw_screen ap_draw.cpp /^void draw_screen (int player) {$/;" f
-+draw_screen_angle .pc/01-Makefile.patch/ap_draw.cpp /^void draw_screen_angle (int player, int angle) {$/;" f
-+draw_screen_angle ap_draw.cpp /^void draw_screen_angle (int player, int angle) {$/;" f
-+event .pc/01-Makefile.patch/ap_input.cpp /^SDL_Event event;$/;" v
-+event ap_input.cpp /^SDL_Event event;$/;" v
-+fillscreen .pc/01-Makefile.patch/ap_draw.cpp /^void fillscreen (int ch) {$/;" f
-+fillscreen ap_draw.cpp /^void fillscreen (int ch) {$/;" f
-+fillsquare menu.cpp /^void fillsquare(int y1, int x1, int height, int width) {$/;" f
-+findobj .pc/01-Makefile.patch/ap_draw.cpp /^int findobj(XY coord) { \/\/ returns object number of hit object or num favoring portals$/;" f
-+findobj ap_draw.cpp /^int findobj(XY coord) { \/\/ returns object number of hit object or num favoring portals$/;" f
-+fireportal ap_play.cpp /^void fireportal (int por, int pl) {$/;" f
-+flushinput .pc/01-Makefile.patch/ap_input.cpp /^void flushinput () {$/;" f
-+flushinput ap_input.cpp /^void flushinput () {$/;" f
-+gamespeed ap_play.cpp /^int gamespeed = defaultspeed;$/;" v
-+get_microseconds ap_play.cpp /^unsigned long long int get_microseconds() {$/;" f
-+getinput .pc/01-Makefile.patch/ap_input.cpp /^int getinput() {$/;" f
-+getinput ap_input.cpp /^int getinput() {$/;" f
-+graphics_deinit .pc/01-Makefile.patch/ap_draw.cpp /^void graphics_deinit () {$/;" f
-+graphics_deinit ap_draw.cpp /^void graphics_deinit () {$/;" f
-+graphics_init .pc/01-Makefile.patch/ap_draw.cpp /^void graphics_init (int def, int fullscreen, int height, int width, string font) {$/;" f
-+graphics_init ap_draw.cpp /^void graphics_init (int def, int fullscreen, int height, int width, string font) {$/;" f
-+hasevent .pc/01-Makefile.patch/ap_input.cpp /^int hasevent = 0;$/;" v
-+hasevent ap_input.cpp /^int hasevent = 0;$/;" v
-+help_menu menu.cpp /^void help_menu () {$/;" f
-+hitsobj ap_play.cpp /^int hitsobj(int num, int yy, int xx) { \/\/ returns object number of hit object or num$/;" f
-+hitswall ap_play.cpp /^int hitswall(int yy, int xx) {$/;" f
-+in_portal ap_play.cpp /^int in_portal () { \/\/ Technically both portals are the same space.$/;" f
-+key_table .pc/01-Makefile.patch/ap_input.cpp /^} key_table[] = \/\/ shamelessly copied.$/;" v typeref:struct:__anon2 file:
-+key_table ap_input.cpp /^} key_table[] = \/\/ shamelessly copied.$/;" v typeref:struct:__anon1 file:
-+keycode .pc/01-Makefile.patch/ap_input.cpp /^ SDLKey keycode;$/;" m struct:__anon2 file:
-+keycode ap_input.cpp /^ SDLKey keycode;$/;" m struct:__anon1 file:
-+level ap_play.cpp /^int level, maxlevel;$/;" v
-+levelstats ap_play.cpp /^statstype levelstats;$/;" v
-+load_ambience ap_sound.cpp /^int load_ambience (string mappack, string filename) {$/;" f
-+loadmaps main.cpp /^int loadmaps (string mappack) { \/\/ Looks for the mappack directory and loads$/;" f
-+lvlname ap_play.cpp /^string lvlname, texttrigger[9];$/;" v
-+main main.cpp /^int main(int args, char* argv[]) {$/;" f
-+main_menu menu.cpp /^int main_menu (string mappack) {$/;" f
-+map ap_play.cpp /^vector<vector<int> > map;$/;" v
-+map_screen .pc/01-Makefile.patch/ap_draw.cpp /^void map_screen (int player, XY center, XY offset, int angle, vector<vector<int> >& screenmap, int r) {$/;" f
-+map_screen ap_draw.cpp /^void map_screen (int player, XY center, XY offset, int angle, vector<vector<int> >& screenmap, int r) {$/;" f
-+maxfling ap_play.cpp /^const int maxfling = 20;$/;" v
-+maxlevel ap_play.cpp /^int level, maxlevel;$/;" v
-+maxspeed ap_play.cpp /^const int maxspeed = 6;$/;" v
-+menu menu.cpp /^int menu (vector <string>& items, int selection) {$/;" f
-+mouseon .pc/01-Makefile.patch/ap_input.cpp /^int mouseon = 0;$/;" v
-+mouseon ap_input.cpp /^int mouseon = 0;$/;" v
-+move_object ap_play.cpp /^int move_object (int c) { \/\/ collision detection and movement.$/;" f
-+move_player ap_play.cpp /^int move_player (int pl) {$/;" f
-+music_files ap_sound.cpp /^string music_files[num_music_files] = {$/;" v
-+normal .pc/01-Makefile.patch/ap_input.cpp /^ unsigned short normal;$/;" m struct:__anon2 file:
-+normal ap_input.cpp /^ unsigned short normal;$/;" m struct:__anon1 file:
-+num_music_files ap_sound.cpp /^const int num_music_files = 5;$/;" v
-+numdeaths asciiportal.h /^ int numdeaths;$/;" m class:statstype
-+numkeypad .pc/01-Makefile.patch/ap_input.cpp /^ bool numkeypad;$/;" m struct:__anon2 file:
-+numkeypad ap_input.cpp /^ bool numkeypad;$/;" m struct:__anon1 file:
-+numportals asciiportal.h /^ int numportals;$/;" m class:statstype
-+numsteps asciiportal.h /^ int numsteps;$/;" m class:statstype
-+numticks asciiportal.h /^ int numticks;$/;" m class:statstype
-+obj_color_pair .pc/01-Makefile.patch/ap_draw.cpp /^int obj_color_pair (int obj) {$/;" f
-+obj_color_pair ap_draw.cpp /^int obj_color_pair (int obj) {$/;" f
-+obj_screenchar .pc/01-Makefile.patch/ap_draw.cpp /^int obj_screenchar(int obj) {$/;" f
-+obj_screenchar ap_draw.cpp /^int obj_screenchar(int obj) {$/;" f
-+object asciiportal.h /^class object {$/;" c
-+objs ap_play.cpp /^vector <object> objs;$/;" v
-+oldkey .pc/01-Makefile.patch/ap_input.cpp /^int oldkey = ERR;$/;" v
-+oldkey ap_input.cpp /^int oldkey = ERR;$/;" v
-+pause_menu menu.cpp /^int pause_menu (int player) {$/;" f
-+pauserun .pc/01-Makefile.patch/ap_input.cpp /^int pauserun (int d) {$/;" f
-+pauserun ap_input.cpp /^int pauserun (int d) {$/;" f
-+physics ap_play.cpp /^int physics () { \/\/ returns the index of the player so we don't have to search for this 3 times.$/;" f
-+play ap_play.cpp /^int play (string mappack) {$/;" f
-+play_sound ap_sound.cpp /^int play_sound (int c) {$/;" f
-+pollevent .pc/01-Makefile.patch/ap_input.cpp /^int pollevent () {$/;" f
-+pollevent ap_input.cpp /^int pollevent () {$/;" f
-+por_col ap_play.cpp /^int por_col (int yy, int xx) { \/\/ Collision speciffic to portal shots$/;" f
-+portalspeed ap_play.cpp /^const int portalspeed = 5;$/;" v
-+processevent .pc/01-Makefile.patch/ap_input.cpp /^int processevent () { \/\/ Convert keys down to PDC key commands. Introduces priority if multiple keys are pressed.$/;" f
-+processevent ap_input.cpp /^int processevent () { \/\/ Convert keys down to PDC key commands. Introduces priority if multiple keys are pressed.$/;" f
-+rawmaps_maxwidth main.cpp /^vector<unsigned int> rawmaps_maxwidth;$/;" v
-+restms .pc/01-Makefile.patch/ap_input.cpp /^void restms(int mils) { \/\/ a sort of busy wait to catch keyboard input$/;" f
-+restms ap_input.cpp /^void restms(int mils) { \/\/ a sort of busy wait to catch keyboard input$/;" f
-+roll_credits menu.cpp /^void roll_credits (string mappack) {$/;" f
-+sc ap_play.cpp /^int sc (int x) {$/;" f
-+screenchar .pc/01-Makefile.patch/ap_draw.cpp /^int screenchar(int o) {$/;" f
-+screenchar ap_draw.cpp /^int screenchar(int o) {$/;" f
-+scrolling .pc/01-Makefile.patch/ap_draw.cpp /^string scrolling;$/;" v
-+scrolling ap_draw.cpp /^string scrolling;$/;" v
-+scrollmessage .pc/01-Makefile.patch/ap_draw.cpp /^void scrollmessage () {$/;" f
-+scrollmessage ap_draw.cpp /^void scrollmessage () {$/;" f
-+scrolltick .pc/01-Makefile.patch/ap_draw.cpp /^int scrolltick;$/;" v
-+scrolltick ap_draw.cpp /^int scrolltick;$/;" v
-+select_level menu.cpp /^int select_level (int maxlevel, int level){$/;" f
-+select_mapset menu.cpp /^string select_mapset () {$/;" f
-+setup_level ap_play.cpp /^int setup_level (int lvl, string mappack) { \/\/ setup map, and objects from raw data.$/;" f
-+shifted .pc/01-Makefile.patch/ap_input.cpp /^ unsigned short shifted;$/;" m struct:__anon2 file:
-+shifted ap_input.cpp /^ unsigned short shifted;$/;" m struct:__anon1 file:
-+soundEffects ap_sound.cpp /^Mix_Chunk* soundEffects[MAXSound];$/;" v
-+sound_files ap_sound.cpp /^string sound_files[MAXSound] = {$/;" v
-+sound_init ap_sound.cpp /^int sound_init () {$/;" f
-+start_ambience ap_sound.cpp /^int start_ambience () {$/;" f
-+startscrollmessage .pc/01-Makefile.patch/ap_draw.cpp /^void startscrollmessage (string msg) {$/;" f
-+startscrollmessage ap_draw.cpp /^void startscrollmessage (string msg) {$/;" f
-+statstype asciiportal.h /^class statstype {$/;" c
-+statusmessage .pc/01-Makefile.patch/ap_draw.cpp /^void statusmessage (string msg) {$/;" f
-+statusmessage ap_draw.cpp /^void statusmessage (string msg) {$/;" f
-+statusmsg .pc/01-Makefile.patch/ap_draw.cpp /^string statusmsg;$/;" v
-+statusmsg ap_draw.cpp /^string statusmsg;$/;" v
-+statustick .pc/01-Makefile.patch/ap_draw.cpp /^int statustick;$/;" v
-+statustick ap_draw.cpp /^int statustick;$/;" v
-+still_alive ap_play.cpp /^int still_alive (int pl) {$/;" f
-+stop_ambience ap_sound.cpp /^void stop_ambience () {$/;" f
-+stopmessages .pc/01-Makefile.patch/ap_draw.cpp /^void stopmessages () {$/;" f
-+stopmessages ap_draw.cpp /^void stopmessages () {$/;" f
-+switch_in_portal ap_play.cpp /^int switch_in_portal() { \/\/ find what's in the portal and switch it to the other portal$/;" f
-+texttrigger ap_play.cpp /^string lvlname, texttrigger[9];$/;" v
-+tick asciiportal.h /^ int type, tick;$/;" m class:object
-+ticks ap_play.cpp /^int ticks = 0;$/;" v
-+toggle_ambience ap_sound.cpp /^void toggle_ambience () {$/;" f
-+type asciiportal.h /^ int type, tick;$/;" m class:object
-+will_hit ap_play.cpp /^int will_hit (int c) {$/;" f
-+x asciiportal.h /^ int x; int y;$/;" m class:XY
-+y asciiportal.h /^ int x; int y;$/;" m class:XY
diff --git a/debian/patches/series b/debian/patches/series
index 2a8c777..3997568 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
01-Makefile.patch
-debian-changes-1.2c-1
--
asciiportal - a puzzle jump'n'run adventure game
More information about the Pkg-games-commits
mailing list