rogueclone-cvs Mailing List for Rogue Clone IV (Page 3)
Brought to you by:
mlehotay
Menu
▾
▴
rogueclone-cvs — Mailing list for CVS commit messages
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(8) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(8) |
Feb
(24) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
(5) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(23) |
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
(5) |
| 2009 |
Jan
(6) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <mle...@us...> - 2004-02-20 02:33:27
|
Update of /cvsroot/rogueclone/rogue/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28883/doc Added Files: license.txt Log Message: move license to doc directory --- NEW FILE: license.txt --- Copyright (c) 1988, 1993 The Regents of the University of California. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. 3. Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
|
From: <mle...@us...> - 2004-02-20 02:33:26
|
Update of /cvsroot/rogueclone/rogue/dist In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28883/dist Removed Files: license.txt Log Message: move license to doc directory --- license.txt DELETED --- |
|
From: <mle...@us...> - 2004-02-20 01:53:40
|
Update of /cvsroot/rogueclone/rogue/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22078 Removed Files: clone.html Log Message: Moved descriptions of & and ^A commands to guidebook and removed clone.html --- clone.html DELETED --- |
|
From: <mle...@us...> - 2004-02-20 01:53:04
|
Update of /cvsroot/rogueclone/rogue/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22013 Modified Files: guide.html Log Message: Moved descriptions of & and ^A commands to guidebook and removed clone.html Index: guide.html =================================================================== RCS file: /cvsroot/rogueclone/rogue/doc/guide.html,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** guide.html 30 Jan 2004 20:33:03 -0000 1.3 --- guide.html 20 Feb 2004 01:42:19 -0000 1.4 *************** *** 330,333 **** --- 330,339 ---- <tr valign=top> + <td><kbd><<small>SCROLL LOCK</small>></kbd> + <td>Toggle Fast Play mode. In addition to the keys described above, you may use + the directional keys on the numeric keypad to move. In Fast Play mode these + keys will normally make you run instead of walk. + + <tr valign=top> <td><kbd>t</kbd> <td>Throw an object. This is a prefix command. When followed with a direction *************** *** 519,522 **** --- 525,541 ---- <!-- @ Reprint the status line on the message line --> + <tr valign=top> + <td><kbd>&</kbd> + <td>Save a copy of the screen into the file <small>SCREEN.TXT</small>. + + <tr valign=top> + <td><kbd>^A</kbd> + <td>Show your real and effective average health point raises. <samp>R-Hp</samp> + is the average increase to your maximum health points from gaining experience + level levels. <samp>E-Hp</samp> is the average increase per experience level + including other changes to your maximum health points. The number of "other" + health points you have gained (<samp>!</samp>) and lost (<samp>V</samp>) is + also shown. + </table> |
|
From: <mle...@us...> - 2004-02-19 02:23:05
|
Update of /cvsroot/rogueclone/rogue/sys In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6164 Modified Files: makefile.wcc Log Message: increase stack size, perform optimizations Index: makefile.wcc =================================================================== RCS file: /cvsroot/rogueclone/rogue/sys/makefile.wcc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makefile.wcc 28 Jun 2003 15:38:52 -0000 1.2 --- makefile.wcc 19 Feb 2004 02:13:06 -0000 1.3 *************** *** 7,14 **** GAME = rogue ! STACK = 4096 # eventually want to compile with -wx ! wcc_options = -bt=dos -mm -zq -w2 -fr -fo=$(OBJ)\ wlink_options = --- 7,14 ---- GAME = rogue ! STACK = 8k # eventually want to compile with -wx ! wcc_options = -bt=dos -mm -zq -w2 -ox -fr -fo=$(OBJ)\ wlink_options = |
|
From: <mle...@us...> - 2004-02-19 02:22:08
|
Update of /cvsroot/rogueclone/rogue/sys In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5806 Modified Files: makefile.msc Log Message: add header file dependencies Index: makefile.msc =================================================================== RCS file: /cvsroot/rogueclone/rogue/sys/makefile.msc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile.msc 16 Feb 2004 00:42:28 -0000 1.3 --- makefile.msc 19 Feb 2004 02:12:10 -0000 1.4 *************** *** 33,47 **** @$(RC) -fo $@ $(sys)/$(game).rc ! #implicit rule for the ansi source files {$(src)}.c{$(obj)}.obj: @$(CC) /c $(CFLAGS) /Fo$(obj)\ /Za $< ! #explicit rule for the non-ansi source files ! $(obj)\curses.obj : $(src)\curses.c $(h)\rogue.h @$(CC) /c $(CFLAGS) /Fo$(obj)\ $(src)\$(@B).c ! $(obj)\machdep.obj : $(src)\machdep.c $(h)\rogue.h $(h)\paths.h $(h)\version.h @$(CC) /c $(CFLAGS) /Fo$(obj)\ $(src)\$(@B).c ! # need to add dependencies for every object file ############################################################################### --- 33,70 ---- @$(RC) -fo $@ $(sys)/$(game).rc ! # implicit rule for the ansi source files {$(src)}.c{$(obj)}.obj: @$(CC) /c $(CFLAGS) /Fo$(obj)\ /Za $< ! # explicit rules for the non-ansi source files ! $(obj)\curses.obj : @$(CC) /c $(CFLAGS) /Fo$(obj)\ $(src)\$(@B).c ! $(obj)\machdep.obj : @$(CC) /c $(CFLAGS) /Fo$(obj)\ $(src)\$(@B).c ! # header files ! $(obj)\curses.obj : $(h)\rogue.h ! $(obj)\hit.obj : $(h)\rogue.h ! $(obj)\init.obj : $(h)\rogue.h $(h)\version.h $(h)\paths.h ! $(obj)\invent.obj : $(h)\rogue.h $(h)\paths.h ! $(obj)\level.obj : $(h)\rogue.h ! $(obj)\machdep.obj : $(h)\rogue.h $(h)\paths.h $(h)\version.h ! $(obj)\main.obj : $(h)\rogue.h ! $(obj)\message.obj : $(h)\rogue.h $(h)\paths.h ! $(obj)\monster.obj : $(h)\rogue.h ! $(obj)\move.obj : $(h)\rogue.h ! $(obj)\object.obj : $(h)\rogue.h $(h)\paths.h ! $(obj)\pack.obj : $(h)\rogue.h ! $(obj)\play.obj : $(h)\rogue.h $(h)\version.h ! $(obj)\random.obj : ! $(obj)\ring.obj : $(h)\rogue.h ! $(obj)\room.obj : $(h)\rogue.h ! $(obj)\save.obj : $(h)\rogue.h ! $(obj)\score.obj : $(h)\rogue.h $(h)\paths.h ! $(obj)\spec_hit.obj : $(h)\rogue.h ! $(obj)\throw.obj : $(h)\rogue.h ! $(obj)\trap.obj : $(h)\rogue.h ! $(obj)\use.obj : $(h)\rogue.h ! $(obj)\zap.obj : $(h)\rogue.h ############################################################################### |
|
From: <mle...@us...> - 2004-02-19 01:49:59
|
Update of /cvsroot/rogueclone/rogue/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv646 Modified Files: pack.c Log Message: fix "your not wearing any" Index: pack.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/pack.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** pack.c 30 Jan 2004 20:33:03 -0000 1.2 --- pack.c 19 Feb 2004 01:40:00 -0000 1.3 *************** *** 332,336 **** if (rogue.armor) { ! message("your already wearing some", 0); return; } --- 332,336 ---- if (rogue.armor) { ! message("you're already wearing some", 0); return; } |
|
From: <mle...@us...> - 2004-02-19 01:49:03
|
Update of /cvsroot/rogueclone/rogue/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv555 Modified Files: curses.c Log Message: stop stairs from blinking in DOS port Index: curses.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/curses.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** curses.c 17 Feb 2004 21:40:24 -0000 1.7 --- curses.c 19 Feb 2004 01:39:06 -0000 1.8 *************** *** 728,731 **** --- 728,736 ---- regs.h.al = videomode; intr_fn(0x10, ®s); + + /* turn off the blinkin' blinking */ + regs.x.ax = 0x1003; + regs.x.bx = 0; + intr_fn(0x10, ®s); #endif } |
|
From: <mle...@us...> - 2004-02-18 03:43:34
|
Update of /cvsroot/rogueclone/rogue/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1584/src Modified Files: room.c Log Message: fix colour of objects in tunnels Index: room.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/room.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** room.c 17 Feb 2004 23:58:56 -0000 1.7 --- room.c 18 Feb 2004 03:34:20 -0000 1.8 *************** *** 273,278 **** obj = object_at(&level_objects, row, col); cc.b16 = get_mask_char(obj->what_is).b16; ! if (mask & TUNNEL) ! cc.b8.color = MAKE_COLOR(FGCOLOR_OF(cc.b8.color),GRAY); return cc; } --- 273,279 ---- obj = object_at(&level_objects, row, col); cc.b16 = get_mask_char(obj->what_is).b16; ! if ((mask & TUNNEL) && use_doschars) ! cc.b8.color = MAKE_COLOR(FGCOLOR_OF(cc.b8.color), ! use_color ? WHITE : GRAY); return cc; } |
|
From: <mle...@us...> - 2004-02-18 00:08:06
|
Update of /cvsroot/rogueclone/rogue/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26109 Modified Files: room.c Log Message: fixed inconsistent screen attributes when changing color option Index: room.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/room.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** room.c 16 Feb 2004 01:01:46 -0000 1.6 --- room.c 17 Feb 2004 23:58:56 -0000 1.7 *************** *** 56,59 **** --- 56,63 ---- extern char *login_name, *fruit, *press_space; + /* don't modify use_colors until entire screen is redrawn, otherwise + * some lines are displayed in color and others in black & white */ + static boolean color_kludge; + #define NOPTS 7 *************** *** 80,84 **** { "Play in color (\"color\"): ", ! 1, (char **) 0, &use_color, 0, 1 }, { --- 84,88 ---- { "Play in color (\"color\"): ", ! 1, (char **) 0, &color_kludge, 0, 1 }, { *************** *** 92,96 **** { "Fruit (\"fruit\"): ", ! 0, &fruit, (boolean *) 0, 1, 0 } }; --- 96,100 ---- { "Fruit (\"fruit\"): ", ! 0, &fruit, (boolean *) 0, 0, 0 } }; *************** *** 691,694 **** --- 695,700 ---- char buf[MAX_OPT_LEN + 2]; + color_kludge = use_color; + for (i = 0; i < NOPTS+1; i++) { for (j = 0; j < DCOLS; j++) { *************** *** 787,790 **** --- 793,798 ---- } } + + use_color = color_kludge; if (need_regen) { |
|
From: <mle...@us...> - 2004-02-17 21:49:27
|
Update of /cvsroot/rogueclone/rogue/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26874 Modified Files: curses.c Log Message: cleaned up kludge in rgetchar Index: curses.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/curses.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** curses.c 17 Feb 2004 02:56:58 -0000 1.6 --- curses.c 17 Feb 2004 21:40:24 -0000 1.7 *************** *** 148,152 **** rgetchar() { ! unsigned char ch; #ifdef _MSC_VER INPUT_RECORD ir; --- 148,152 ---- rgetchar() { ! char ch; #ifdef _MSC_VER INPUT_RECORD ir; *************** *** 187,190 **** --- 187,193 ---- } + if(!ir.Event.KeyEvent.uChar.AsciiChar) + continue; + /* apply shift or control to keypad movement keys */ if((ir.Event.KeyEvent.wVirtualKeyCode>=VK_PRIOR && *************** *** 211,216 **** } ! if(!(ch = ir.Event.KeyEvent.uChar.AsciiChar) || ch > 127) ! continue; #else regs.h.ah = 0x00; /* get keystroke */ --- 214,218 ---- } ! ch = ir.Event.KeyEvent.uChar.AsciiChar; #else regs.h.ah = 0x00; /* get keystroke */ |
|
From: <mle...@us...> - 2004-02-17 03:05:26
|
Update of /cvsroot/rogueclone/rogue/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9979/src Modified Files: curses.c Log Message: Allow both shift and control with keypad in windows port Index: curses.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/curses.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** curses.c 31 Jan 2004 17:00:52 -0000 1.5 --- curses.c 17 Feb 2004 02:56:58 -0000 1.6 *************** *** 148,152 **** rgetchar() { ! register ch; #ifdef _MSC_VER INPUT_RECORD ir; --- 148,152 ---- rgetchar() { ! unsigned char ch; #ifdef _MSC_VER INPUT_RECORD ir; *************** *** 164,168 **** ir.EventType != KEY_EVENT || !ir.Event.KeyEvent.bKeyDown) continue; ! switch(ir.Event.KeyEvent.wVirtualKeyCode) { case VK_NUMPAD9: case VK_PRIOR: --- 164,169 ---- ir.EventType != KEY_EVENT || !ir.Event.KeyEvent.bKeyDown) continue; ! ! /* convert keypad input to rogue commands */ switch(ir.Event.KeyEvent.wVirtualKeyCode) { case VK_NUMPAD9: case VK_PRIOR: *************** *** 185,205 **** ir.Event.KeyEvent.uChar.AsciiChar = '.'; break; } ! if((ir.Event.KeyEvent.wVirtualKeyCode>=VK_PRIOR && ir.Event.KeyEvent.wVirtualKeyCode<=VK_DOWN) || (ir.Event.KeyEvent.wVirtualKeyCode>=VK_NUMPAD1 && ! ir.Event.KeyEvent.wVirtualKeyCode<=VK_NUMPAD9)) { ! boolean scrolllock = ir.Event.KeyEvent.dwControlKeyState & ! SCROLLLOCK_ON; ! boolean shift = ir.Event.KeyEvent.dwControlKeyState & ! (SHIFT_PRESSED | LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED); ! ! if((scrolllock && !shift) || (!scrolllock && shift)) { ! /* convert to control character */ ir.Event.KeyEvent.uChar.AsciiChar -= ('a' - 1); } } ! if(!(ch = ir.Event.KeyEvent.uChar.AsciiChar)) continue; #else --- 186,215 ---- ir.Event.KeyEvent.uChar.AsciiChar = '.'; break; } ! ! /* apply shift or control to keypad movement keys */ if((ir.Event.KeyEvent.wVirtualKeyCode>=VK_PRIOR && ir.Event.KeyEvent.wVirtualKeyCode<=VK_DOWN) || (ir.Event.KeyEvent.wVirtualKeyCode>=VK_NUMPAD1 && ! ir.Event.KeyEvent.wVirtualKeyCode<=VK_NUMPAD9)) { ! if(ir.Event.KeyEvent.dwControlKeyState & SHIFT_PRESSED) ! ir.Event.KeyEvent.uChar.AsciiChar -= ('a' - 'A'); ! else if(ir.Event.KeyEvent.dwControlKeyState & (LEFT_CTRL_PRESSED | ! RIGHT_CTRL_PRESSED)) ir.Event.KeyEvent.uChar.AsciiChar -= ('a' - 1); + + /* Check for fast play mode, but only for the keypad. The current + * method of converting y to ^y can mess up answers to y/n questions. */ + if(ir.Event.KeyEvent.dwControlKeyState & SCROLLLOCK_ON) { + if(strchr("hjklyubn", ir.Event.KeyEvent.uChar.AsciiChar)) + ir.Event.KeyEvent.uChar.AsciiChar -= ('a' - 1); + else if(strchr("HJKLYUBN", ir.Event.KeyEvent.uChar.AsciiChar)) + ir.Event.KeyEvent.uChar.AsciiChar += ('a' - 'A'); + else if(strchr("\010\012\013\014\031\025\002\016", + ir.Event.KeyEvent.uChar.AsciiChar)) + ir.Event.KeyEvent.uChar.AsciiChar += ('a' - 1); } } ! if(!(ch = ir.Event.KeyEvent.uChar.AsciiChar) || ch > 127) continue; #else |
|
From: <mle...@us...> - 2004-02-16 15:39:12
|
Update of /cvsroot/rogueclone/rogue/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29534/src Modified Files: save.c Log Message: added options and colors to savefiles Index: save.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/save.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** save.c 16 Feb 2004 04:07:31 -0000 1.4 --- save.c 16 Feb 2004 15:30:57 -0000 1.5 *************** *** 74,77 **** --- 74,83 ---- extern boolean score_only; extern short m_moves; + extern boolean jump; + extern boolean passgo; + extern boolean display_skull; + extern boolean use_color; + extern boolean use_doschars; + extern char *fruit; extern boolean msg_cleared; *************** *** 149,152 **** --- 155,164 ---- r_write(fp, (char *) &score_only, sizeof(score_only)); r_write(fp, (char *) &m_moves, sizeof(m_moves)); + r_write(fp, (char *) &jump, sizeof(jump)); + r_write(fp, (char *) &passgo, sizeof(passgo)); + r_write(fp, (char *) &display_skull, sizeof(display_skull)); + r_write(fp, (char *) &use_color, sizeof(use_color)); + r_write(fp, (char *) &use_doschars, sizeof(use_doschars)); + write_string(fruit, fp); md_gct(&rt_buf); rt_buf.second += 10; /* allow for some processing time */ *************** *** 217,220 **** --- 229,238 ---- r_read(fp, (char *) &score_only, sizeof(score_only)); r_read(fp, (char *) &m_moves, sizeof(m_moves)); + r_read(fp, (char *) &jump, sizeof(jump)); + r_read(fp, (char *) &passgo, sizeof(passgo)); + r_read(fp, (char *) &display_skull, sizeof(display_skull)); + r_read(fp, (char *) &use_color, sizeof(use_color)); + r_read(fp, (char *) &use_doschars, sizeof(use_doschars)); + read_string(fruit, fp); r_read(fp, (char *) &saved_time, sizeof(saved_time)); *************** *** 286,290 **** { short i, j; ! char buf[DCOLS]; for (i = 0; i < DROWS; i++) { --- 304,308 ---- { short i, j; ! color_char buf[DCOLS]; for (i = 0; i < DROWS; i++) { *************** *** 292,303 **** r_write(fp, (char *) dungeon[i], (DCOLS * sizeof(dungeon[0][0]))); for (j = 0; j < DCOLS; j++) { ! buf[j] = mvinch(i, j); } ! r_write(fp, buf, DCOLS); } else { r_read(fp, (char *) dungeon[i], (DCOLS * sizeof(dungeon[0][0]))); ! r_read(fp, buf, DCOLS); for (j = 0; j < DCOLS; j++) { ! mvaddch(i, j, buf[j]); } } --- 310,321 ---- r_write(fp, (char *) dungeon[i], (DCOLS * sizeof(dungeon[0][0]))); for (j = 0; j < DCOLS; j++) { ! buf[j] = mvincch(i, j); } ! r_write(fp, (char *) buf, (DCOLS * sizeof(buf[0]))); } else { r_read(fp, (char *) dungeon[i], (DCOLS * sizeof(dungeon[0][0]))); ! r_read(fp, (char *) buf, (DCOLS * sizeof(buf[0]))); for (j = 0; j < DCOLS; j++) { ! mvaddcch(i, j, buf[j]); } } |
|
From: <mle...@us...> - 2004-02-16 04:15:14
|
Update of /cvsroot/rogueclone/rogue/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3412/src Modified Files: invent.c save.c Log Message: bugfixes: restoring games always fails windows port hangs after listing all commands screen is B&W after listing all commands Index: invent.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/invent.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** invent.c 14 Feb 2004 13:42:31 -0000 1.4 --- invent.c 16 Feb 2004 04:07:31 -0000 1.5 *************** *** 320,330 **** case LIST: { ! char save[(((COMS / 2) + (COMS % 2)) + 1)][DCOLS]; short rows = (((COMS / 2) + (COMS % 2)) + 1); boolean need_two_screens; ! if (rows > LINES) { need_two_screens = 1; ! rows = LINES; } k = 0; --- 320,330 ---- case LIST: { ! color_char save[(((COMS / 2) + (COMS % 2)) + 1)][DCOLS]; short rows = (((COMS / 2) + (COMS % 2)) + 1); boolean need_two_screens; ! if (rows > DROWS) { need_two_screens = 1; ! rows = DROWS; } k = 0; *************** *** 332,336 **** for (i = 0; i < rows; i++) { for (j = 0; j < DCOLS; j++) { ! save[i][j] = mvinch(i, j); } } --- 332,336 ---- for (i = 0; i < rows; i++) { for (j = 0; j < DCOLS; j++) { ! save[i][j] = mvincch(i, j); } } *************** *** 341,345 **** } for (i = 0; i < (rows-1); i++) { ! if (i < (LINES-1)) { if (((i + i) < COMS) && ((i+i+k) < COMS)) { mvaddstr(i, 0, com_id_tab[i+i+k].com_desc); --- 341,345 ---- } for (i = 0; i < (rows-1); i++) { ! if (i < (DROWS-1)) { if (((i + i) < COMS) && ((i+i+k) < COMS)) { mvaddstr(i, 0, com_id_tab[i+i+k].com_desc); *************** *** 363,367 **** move(i, 0); for (j = 0; j < DCOLS; j++) { ! addch(save[i][j]); } } --- 363,367 ---- move(i, 0); for (j = 0; j < DCOLS; j++) { ! addcch(save[i][j]); } } Index: save.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/save.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** save.c 30 Jan 2004 20:33:03 -0000 1.3 --- save.c 16 Feb 2004 04:07:31 -0000 1.4 *************** *** 224,227 **** --- 224,229 ---- } + fclose(fp); + md_gfmt(fname, &mod_time); /* get file modification time */ *************** *** 234,238 **** } ring_stats(0); - fclose(fp); } --- 236,239 ---- |
|
From: <mle...@us...> - 2004-02-16 01:09:24
|
Update of /cvsroot/rogueclone/rogue/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6557/src Modified Files: init.c paths.h play.c room.c score.c use.c version.h Log Message: made a few small asthetic changes -- renamed doschars option to PCgraphics made filenames lowercase for Windows 'v' command now says Rogue Clone IV got rid of green floors in B&W UNIX mode use skull instead of tombstone when noPCgraphics made version macros default to "pre-release" Index: init.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/init.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** init.c 14 Feb 2004 13:42:31 -0000 1.4 --- init.c 16 Feb 2004 01:01:46 -0000 1.5 *************** *** 332,336 **** } else if (!strncmp(eptr, "passgo", 6)) { passgo = optval; ! } else if (!strncmp(eptr, "doschars", 8)) { use_doschars = optval; } else if (!strncmp(eptr, "color", 5)) { --- 332,336 ---- } else if (!strncmp(eptr, "passgo", 6)) { passgo = optval; ! } else if (!strncmp(eptr, "PCgraphics", 10)) { use_doschars = optval; } else if (!strncmp(eptr, "color", 5)) { Index: paths.h =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/paths.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** paths.h 30 Jan 2004 20:33:03 -0000 1.2 --- paths.h 16 Feb 2004 01:01:46 -0000 1.3 *************** *** 30,34 **** --- 30,40 ---- */ + #ifdef _MSC_VER + #define _PATH_SCOREFILE "rogue.sco" + #define _PATH_ERRORFILE "rogue.sav" + #define _PATH_SCREENFILE "screen.txt" + #else #define _PATH_SCOREFILE "ROGUE.SCO" #define _PATH_ERRORFILE "ROGUE.SAV" #define _PATH_SCREENFILE "SCREEN.TXT" + #endif Index: play.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/play.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** play.c 14 Feb 2004 13:42:31 -0000 1.4 --- play.c 16 Feb 2004 01:01:46 -0000 1.5 *************** *** 215,220 **** break; case 'v': ! message("rogue-clone: Version III. (Tim Stoehr was here), tektronix!zeus!tims", 0); ! message(LONG_VERSION_STRING, 0); break; case 'Q': --- 215,219 ---- break; case 'v': ! message(LONG_VERSION_STRING, 0); break; case 'Q': Index: room.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/room.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** room.c 14 Feb 2004 13:42:31 -0000 1.5 --- room.c 16 Feb 2004 01:01:46 -0000 1.6 *************** *** 83,87 **** }, { ! "Use DOS character set (\"doschars\"): ", 1, (char **) 0, &use_doschars, 0, 1 }, --- 83,87 ---- }, { ! "Use extended ASCII graphics (\"PCgraphics\"): ", 1, (char **) 0, &use_doschars, 0, 1 }, *************** *** 241,248 **** cc.b8.ch = use_doschars ? scrTerrain[i].dosch : scrTerrain[i].ch; - /* NS: Mild hack needed to prevent an aesthetic disaster :-) */ - if (mask == FLOOR && !use_doschars) - cc.b8.color = MAKE_COLOR(GREEN,BLACK); - return cc; } --- 241,244 ---- Index: score.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/score.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** score.c 30 Jan 2004 20:33:03 -0000 1.4 --- score.c 16 Feb 2004 01:01:46 -0000 1.5 *************** *** 52,56 **** extern char *m_names[]; extern short cur_level, max_level; ! extern boolean score_only, display_skull, msg_cleared, use_color; extern char *byebye_string; --- 52,56 ---- extern char *m_names[]; extern short cur_level, max_level; ! extern boolean score_only, display_skull, msg_cleared, use_color, use_doschars; extern char *byebye_string; *************** *** 101,107 **** if ((!other) && (display_skull)) { ! clear(); ! #if RIP_TOMBSTONE == 0 /* classic skull */ mvaddstr(4, 32, "__---------__"); mvaddstr(5, 30, "_~ ~_"); --- 101,107 ---- if ((!other) && (display_skull)) { ! clear(); ! if(!use_doschars) { /* classic skull */ mvaddstr(4, 32, "__---------__"); mvaddstr(5, 30, "_~ ~_"); *************** *** 126,130 **** center(22, buf); ! #else /* modern tombstone, pulled from PC-Rogue with apologies */ boxchars[0] = get_terrain_char(HORWALL); boxchars[1] = get_terrain_char(VERTWALL); --- 126,130 ---- center(22, buf); ! } else {/* modern tombstone, pulled from PC-Rogue with apologies */ boxchars[0] = get_terrain_char(HORWALL); boxchars[1] = get_terrain_char(VERTWALL); *************** *** 142,150 **** center(16, gold); /* NS: ought to put the date here for effect. */ ! center_in_color(21, " * * * ", MAKE_COLOR(RED,BLACK)); ! center_in_color(22, "___\\/(\\/)/(\\/ \\\\(//)\\)\\/(//)\\\\)//(\\__", MAKE_COLOR(GREEN,BLACK)); ! #endif ! } else { message(buf, 0); --- 142,149 ---- center(16, gold); /* NS: ought to put the date here for effect. */ ! center_in_color(21, " * * * ", MAKE_COLOR(RED,BLACK)); ! center_in_color(22, "___\\/(\\/)/(\\/ \\\\(//)\\)\\/(//)\\\\)//(\\__", MAKE_COLOR(GREEN,BLACK)); ! } } else { message(buf, 0); Index: use.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/use.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** use.c 30 Jan 2004 20:33:03 -0000 1.3 --- use.c 16 Feb 2004 01:01:47 -0000 1.4 *************** *** 334,338 **** } else { if (ratio < 0.33) { ! ratio = 0.33; } if (extra) { --- 334,338 ---- } else { if (ratio < 0.33) { ! ratio = 0.33f; } if (extra) { Index: version.h =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/version.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** version.h 14 Feb 2004 13:42:31 -0000 1.3 --- version.h 16 Feb 2004 01:01:47 -0000 1.4 *************** *** 2,33 **** #define VERSION_MINOR 1 #define VERSION_PATCH 0 - #define EXPERIMENTAL 1 - - #define STRINGIZE(x) #x - #define STR(x) STRINGIZE(x) - - #if VERSION_PATCH == 0 - #define PATCH_STRING - #else - #define PATCH_STRING "." STR(VERSION_PATCH) - #endif - - #if EXPERIMENTAL == 0 - #define DEV_STRING - #else - #define DEV_STRING " (in development)" - #endif - - #define VERSION_STRING "Rogue Clone IV version " STR(VERSION_MAJOR) \ - "." STR(VERSION_MINOR) PATCH_STRING DEV_STRING - - #define LONG_VERSION_STRING VERSION_STRING " built " __DATE__ " " __TIME__ - - #define COPYRIGHT_LINE1 \ - "Based on Timothy C. Stoehr's Rogue 5.3 Clone Version III" - - #define COPYRIGHT_LINE2 \ - "Copyright (c) 1988, 1993 The Regents of the University of California" - /*****************************************************************************/ --- 2,5 ---- *************** *** 36,50 **** /* * Rogue Clone IV 2.1.0, February ??, 2004 ! * now builds as a Windows console application as well as DOS * DOS port now compiles with Open Watcom and DJGPP (abandoned Watcom 7.0) * now supports color graphics throughout ! * uses PC-Rogue DOS characters * fixed bug in dragon's fire-breathing aim * fixed several bugs pertaining to object naming under gcc - * Note: Nick Straguzzi did almost all the coding for this version */ - - /*****************************************************************************/ /* Version 2.0.x */ --- 8,20 ---- /* * Rogue Clone IV 2.1.0, February ??, 2004 ! * Nick Straguzzi wrote most of the new code for this version ! * new Windows console application port * DOS port now compiles with Open Watcom and DJGPP (abandoned Watcom 7.0) * now supports color graphics throughout ! * uses PC-Rogue high ASCII characters * fixed bug in dragon's fire-breathing aim * fixed several bugs pertaining to object naming under gcc */ /*****************************************************************************/ /* Version 2.0.x */ *************** *** 89,90 **** --- 59,104 ---- * Initial release, based on rogue clone version II */ + + /*****************************************************************************/ + + #define STRINGIZE(x) #x + #define STR(x) STRINGIZE(x) + + #define NAME_STRING "Rogue Clone IV" + + #if VERSION_PATCH == 0 + #define PATCH_STRING "" + #else + #define PATCH_STRING "." STR(VERSION_PATCH) + #endif + + #ifdef RELEASE /* define this on the [n|w]make command line */ + #define REL_STRING "" + #else + #define REL_STRING " (pre-release)" + #endif + + #if defined(__DOS__) || defined(MSDOS) + #if _M_IX86 >= 300 || defined(__i386__) || defined(__386__) + #define PORT "32-bit DOS" + #else + #define PORT "16-bit DOS" + #endif + #elif defined(_WIN32) || defined(__WINDOWS__) + #define PORT "Windows" + #else + #define PORT "???" + #endif + + #define VERSION_STRING NAME_STRING " version " STR(VERSION_MAJOR) \ + "." STR(VERSION_MINOR) PATCH_STRING REL_STRING + + #define LONG_VERSION_STRING NAME_STRING " v" STR(VERSION_MAJOR) "." \ + STR(VERSION_MINOR) PATCH_STRING " for " PORT REL_STRING \ + " built " __DATE__ " " __TIME__ + + #define COPYRIGHT_LINE1 \ + "Derived from Timothy C. Stoehr's Rogue 5.3 Clone version III" + + #define COPYRIGHT_LINE2 \ + "Copyright (c) 1988, 1993 The Regents of the University of California" |
|
From: <mle...@us...> - 2004-02-16 00:50:04
|
Update of /cvsroot/rogueclone/rogue/sys In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3428 Modified Files: makefile.msc Log Message: add /O2 /W2 to CFLAGS Index: makefile.msc =================================================================== RCS file: /cvsroot/rogueclone/rogue/sys/makefile.msc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makefile.msc 14 Feb 2004 20:43:38 -0000 1.2 --- makefile.msc 16 Feb 2004 00:42:28 -0000 1.3 *************** *** 1,5 **** # NMAKE Makefile for VC98 ! CFLAGS = /nologo #want /W4 LDFLAGS = /nologo /incremental:no /warn:3 LDLIBS = --- 1,5 ---- # NMAKE Makefile for VC98 ! CFLAGS = /nologo /O2 /W2 #want /W4 LDFLAGS = /nologo /incremental:no /warn:3 LDLIBS = |
|
From: <mle...@us...> - 2004-02-14 20:50:20
|
Update of /cvsroot/rogueclone/rogue/sys In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27313 Modified Files: makefile.msc Log Message: turn off incremental linking Index: makefile.msc =================================================================== RCS file: /cvsroot/rogueclone/rogue/sys/makefile.msc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** makefile.msc 31 Jan 2004 17:00:11 -0000 1.1 --- makefile.msc 14 Feb 2004 20:43:38 -0000 1.2 *************** *** 2,6 **** CFLAGS = /nologo #want /W4 ! LDFLAGS = /nologo /warn:3 LDLIBS = --- 2,6 ---- CFLAGS = /nologo #want /W4 ! LDFLAGS = /nologo /incremental:no /warn:3 LDLIBS = *************** *** 43,46 **** --- 43,48 ---- @$(CC) /c $(CFLAGS) /Fo$(obj)\ $(src)\$(@B).c + # need to add dependencies for every object file + ############################################################################### # housekeeping |
|
From: <mle...@us...> - 2004-02-14 14:02:44
|
Update of /cvsroot/rogueclone/rogue In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16297 Modified Files: .cvsignore Log Message: ignore foo Index: .cvsignore =================================================================== RCS file: /cvsroot/rogueclone/rogue/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .cvsignore 28 Jun 2003 15:38:52 -0000 1.1 --- .cvsignore 14 Feb 2004 13:56:15 -0000 1.2 *************** *** 1,4 **** --- 1,5 ---- o exe + foo Makefile rogue.lnk |
Update of /cvsroot/rogueclone/rogue/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13958/src Modified Files: hit.c init.c invent.c message.c object.c play.c rogue.h room.c spec_hit.c version.h Log Message: Got rid of some things that don't appear in any version of standard rogue Index: hit.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/hit.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** hit.c 30 Jan 2004 20:33:03 -0000 1.3 --- hit.c 14 Feb 2004 13:42:31 -0000 1.4 *************** *** 107,115 **** damage /= 3; } - /* NS: Stealing this excellent idea from PC-Rogue */ - if (cur_level == 1) { - damage /= 2; - } - if (damage > 0) { rogue_damage(damage, monster, 0); --- 107,110 ---- Index: init.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/init.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** init.c 30 Jan 2004 20:33:03 -0000 1.3 --- init.c 14 Feb 2004 13:42:31 -0000 1.4 *************** *** 55,60 **** boolean cant_int = 0; boolean did_int = 0; - boolean help_only = 0; - boolean help_env = 0; boolean score_only = 0; boolean init_curses = 0; --- 55,58 ---- *************** *** 65,69 **** boolean use_doschars = 1; boolean use_color = 1; - boolean enable_hypo = 1; char *byebye_string = "Okay, bye bye!"; --- 63,66 ---- *************** *** 90,102 **** do_args(argc, argv); - if (help_only) { - if (help_env) { - print_env_help(); - } else { - print_cli_help(); - } - md_exit(0); - } - if (!score_only && !rest_file) { FILE *fp; --- 87,90 ---- *************** *** 280,353 **** } - /* NS 15 June 2003: can specify your name and preferred fruit on the - * command line, and added CL equivalents for all rogue options. - * For booleans, -x and -x+ are equivalent (on), -x- is off; - * omitting it entirely gives you the default setting (in brackets). - * Both "/" and "-" are accepted as option switch prefixes. - * - * -? = print help message - * -s = score only - * -f xxx = fruit - * -n xxx = name - * -c[+/-] = play in color [on] - * -d[+/-] = use dos characters [on] - * -j[+/-] = use jump moves [off] - * -h[+/-] = allow death by hypothermia [on] - * -p[+/-] = follow passage turns [off] - * -t[+/-] = show skull/tombstone at end [on] - */ do_args(argc, argv) int argc; char *argv[]; { ! short i; for (i = 1; i < argc; i++) { ! if ((argv[i][0] == '-') || (argv[i][0] == '/')) { ! switch(argv[i][1]) { case 's': score_only = 1; break; ! case '?': ! help_only = 1; ! if (argv[i][2] == '?') ! help_env = 1; ! break; ! case 'f': ! i++; ! if (i < argc) { ! if (fruit == 0) ! init_str(&fruit, argv[i]); ! else ! strcpy(fruit, argv[i]); ! } ! break; ! case 'n': ! i++; ! if (i < argc) { ! if (login_name == 0) ! init_str(&login_name, argv[i]); ! else ! strcpy(login_name, argv[i]); ! } ! break; ! case 'j': ! jump = (argv[i][2] != '-'); ! break; ! case 't': ! display_skull = (argv[i][2] != '-'); ! break; ! case 'h': ! enable_hypo = (argv[i][2] != '-'); ! break; ! case 'c': ! use_color = (argv[i][2] != '-'); ! break; ! case 'd': ! use_doschars = (argv[i][2] != '-'); ! break; ! case 'p': ! passgo = (argv[i][2] != '-'); ! break; } } else { --- 268,285 ---- } do_args(argc, argv) int argc; char *argv[]; { ! short i, j; for (i = 1; i < argc; i++) { ! if (argv[i][0] == '-' || argv[i][0] == '/') { ! for (j = 1; argv[i][j]; j++) { ! switch(argv[i][j]) { case 's': score_only = 1; break; ! } } } else { *************** *** 357,418 **** } - - print_cli_help() - { - printf("%s\n", VERSION_STRING); - printf("\n"); - printf(" rogue [-?] [-s] [-n name] [-f fruit]\n"); - printf(" [-c] [-d] [-h] [-j] [-p] [-t] [savefile]\n"); - printf("\n"); - printf(""); - printf(" -? : prints this help message.\n"); - printf(" -s : shows scoreboard only.\n"); - printf(" -n name : rogue name "); - if (login_name[0] != '\0') { - printf ("[%s]", login_name); - } - printf("\n"); - printf(" -f fruit : preferred fruit [%s]\n", - fruit); - printf(" -c[+/-] : play in color [%s]\n", - OPTIONVALUE(use_color)); - printf(" -d[+/-] : use special DOS characters [%s]\n", - OPTIONVALUE(use_doschars)); - printf(" -h[+/-] : allow death by hypothermia [%s]\n", - OPTIONVALUE(enable_hypo)); - printf(" -j[+/-] : show position only at end of run [%s]\n", - OPTIONVALUE(jump)); - printf(" -p[+/-] : follow passage turns while running [%s]\n", - OPTIONVALUE(passgo)); - printf(" -t[+/-] : show tombstone/skull upon death [%s]\n", - OPTIONVALUE(display_skull)); - printf(" savefile : restores saved game from specified file\n"); - printf("\n"); - printf(" For booleans, -x and -x+ both set the option \'on\', -x- is \'off\'\n"); - printf(" Option defaults can be set using ROGUEOPTS environment value. Type\n"); - printf(" \"rogue -??\" for details.\n"); - } - - - - print_env_help() - { - printf("%s\n", VERSION_STRING); - printf("\n"); - printf(" ROGUEOPTS=option1,option2:value,option3...\n"); - printf(""); - printf(" name:Rodney - rogue name\n"); - printf(" fruit:mango - preferred fruit\n"); - printf(" [no]color - play in color\n"); - printf(" [no]doschars - use special DOS characters\n"); - printf(" [no]hypo - allow death by hypothermia\n"); - printf(" [no]jump - show position only at end of run\n"); - printf(" [no]passgo - follow passage turns while running\n"); - printf(" [no]skull or [no]tomb\n"); - printf(" - print tombstone upon death\n"); - } - - - /* NS 15 June 2003 : Updated this to accept negative as well as positive * flags. --- 289,292 ---- *************** *** 458,463 **** } else if (!strncmp(eptr, "passgo", 6)) { passgo = optval; - } else if (!strncmp(eptr, "hypo", 4)) { - enable_hypo = optval; } else if (!strncmp(eptr, "doschars", 8)) { use_doschars = optval; --- 332,335 ---- Index: invent.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/invent.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** invent.c 30 Jan 2004 20:33:03 -0000 1.3 --- invent.c 14 Feb 2004 13:42:31 -0000 1.4 *************** *** 146,150 **** --- 146,154 ---- }; + #ifdef DISCOVERY #define COMS 50 + #else + #define COMS 49 + #endif struct id_com_s { *************** *** 196,204 **** '!', "! shell escape", ',', ", pick something up", ! 'f', "f<dir> fight till death or near death", 'i', "i inventory", 'F', "F<dir> fight till either of you dies", 'I', "I inventory single item", ! 'D', "D list what you've discovered", 'v', "v print version number", 'q', "q quaff potion", --- 200,210 ---- '!', "! shell escape", ',', ", pick something up", ! 'f', "f<dir> fight till death or near death", 'i', "i inventory", 'F', "F<dir> fight till either of you dies", 'I', "I inventory single item", ! #ifdef DISCOVERY ! 'D', "D list what you've discovered", ! #endif 'v', "v print version number", 'q', "q quaff potion", Index: message.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/message.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** message.c 30 Jan 2004 20:33:03 -0000 1.3 --- message.c 14 Feb 2004 13:42:31 -0000 1.4 *************** *** 184,199 **** /* - WAS: Level: 99 Gold: 999999 Hp: 999(999) Str: 99(99) Arm: 99 Exp: 21/10000000 Hungry - - NOW: - Level:99 Gold:999999 Hp:999(999) Str:99(99) Arm:99 Exp:21/10000000 -Hungry- 0 5 1 5 2 5 3 5 4 5 5 5 6 5 7 5 */ - /* NS: Color-coded the stats so that dense players get a visual warning when - * in trouble. Apologies to those who dislike it, but I got tired of - * fainting in the middle of a troll-battle because I forgot to eat. - */ print_stats(stat_mask) register stat_mask; --- 184,191 ---- *************** *** 202,234 **** boolean label; int row = DROWS - 1; ! byte color, label_color, ok_color, warn_color, danger_color; ! int tmp; label = (stat_mask & STAT_LABEL) ? 1 : 0; ! ! if (use_color) { ! label_color = STAT_LABELCOLOR; ! ok_color = STAT_OKCOLOR; ! warn_color = STAT_WARNCOLOR; ! danger_color = STAT_DANGERCOLOR; ! } else { ! label_color = MAKE_COLOR(WHITE,BLACK); ! ok_color = MAKE_COLOR(WHITE,BLACK); ! warn_color = MAKE_COLOR(WHITE,BLACK); ! danger_color = MAKE_COLOR(BRIGHT_WHITE,BLACK); ! } if (stat_mask & STAT_LEVEL) { if (label) { ! mvaddstr_in_color(row, 0, "Level:", label_color); } /* max level taken care of in make_level() */ sprintf(buf, "%d", cur_level); ! mvaddstr_in_color(row, 6, buf, ok_color); pad(buf, 2); } if (stat_mask & STAT_GOLD) { if (label) { ! mvaddstr_in_color(row, 10, "Gold:", label_color); } if (rogue.gold > MAX_GOLD) { --- 194,214 ---- boolean label; int row = DROWS - 1; ! byte color; label = (stat_mask & STAT_LABEL) ? 1 : 0; ! color = use_color ? BRIGHT_YELLOW : MAKE_COLOR(WHITE,BLACK); if (stat_mask & STAT_LEVEL) { if (label) { ! mvaddstr_in_color(row, 0, "Level: ", color); } /* max level taken care of in make_level() */ sprintf(buf, "%d", cur_level); ! mvaddstr_in_color(row, 7, buf, color); pad(buf, 2); } if (stat_mask & STAT_GOLD) { if (label) { ! mvaddstr_in_color(row, 10, "Gold: ", color); } if (rogue.gold > MAX_GOLD) { *************** *** 236,245 **** } sprintf(buf, "%ld", rogue.gold); ! mvaddstr_in_color(row, 15, buf, ok_color); pad(buf, 6); } if (stat_mask & STAT_HP) { if (label) { ! mvaddstr_in_color(row, 23, "Hp:", label_color); } if (rogue.hp_max > MAX_HP) { --- 216,225 ---- } sprintf(buf, "%ld", rogue.gold); ! mvaddstr_in_color(row, 16, buf, color); pad(buf, 6); } if (stat_mask & STAT_HP) { if (label) { ! mvaddstr_in_color(row, 23, "Hp: ", color); } if (rogue.hp_max > MAX_HP) { *************** *** 247,265 **** rogue.hp_max = MAX_HP; } ! ! /* NS: Warn if HP < half; shout if they're < 20% */ ! sprintf(buf, "%d", rogue.hp_current); ! color = (rogue.hp_current <= rogue.hp_max / 5) ? danger_color : ! (rogue.hp_current <= rogue.hp_max / 2) ? warn_color : ! ok_color; ! mvaddstr_in_color(row, 26, buf, color); ! tmp = strlen(buf); ! sprintf(buf, "(%d)", rogue.hp_max); ! addstr_in_color(buf, label_color); ! pad(buf, 8-tmp); } if (stat_mask & STAT_STRENGTH) { if (label) { ! mvaddstr_in_color(row, 36, "Str: ", label_color); } if (rogue.str_max > MAX_STRENGTH) { --- 227,237 ---- rogue.hp_max = MAX_HP; } ! sprintf(buf, "%d(%d)", rogue.hp_current, rogue.hp_max); ! mvaddstr_in_color(row, 27, buf, color); ! pad(buf, 8); } if (stat_mask & STAT_STRENGTH) { if (label) { ! mvaddstr_in_color(row, 36, "Str: ", color); } if (rogue.str_max > MAX_STRENGTH) { *************** *** 267,301 **** rogue.str_max = MAX_STRENGTH; } ! ! /* NS: Warn if strength <= 14; shout if <= 6 */ ! tmp = rogue.str_current + add_strength; ! sprintf(buf, "%d", tmp); ! color = (tmp <= 6) ? danger_color : ! (tmp <= 14) ? warn_color : ok_color; ! mvaddstr_in_color(row, 40, buf, color); ! tmp = strlen(buf); ! sprintf(buf, "(%d)", rogue.str_max); ! addstr_in_color(buf, label_color); ! pad(buf, 6-tmp); } if (stat_mask & STAT_ARMOR) { if (label) { ! mvaddstr_in_color(row, 48, "Arm: ", label_color); } if (rogue.armor && (rogue.armor->d_enchant > MAX_ARMOR)) { rogue.armor->d_enchant = MAX_ARMOR; } ! ! /* NS: Warn if armor = 1 or 2, shout if <= 0 (naked) */ ! tmp = get_armor_class(rogue.armor); ! sprintf(buf, "%d", tmp); ! color = (tmp <= 0) ? danger_color : ! (tmp <= 2) ? warn_color : ok_color; ! mvaddstr_in_color(row, 52, buf, color); pad(buf, 2); } if (stat_mask & STAT_EXP) { if (label) { ! mvaddstr_in_color(row, 56, "Exp: ", label_color); } if (rogue.exp_points > MAX_EXP) { --- 239,261 ---- rogue.str_max = MAX_STRENGTH; } ! sprintf(buf, "%d(%d)", (rogue.str_current + add_strength), ! rogue.str_max); ! mvaddstr_in_color(row, 41, buf, color); ! pad(buf, 6); } if (stat_mask & STAT_ARMOR) { if (label) { ! mvaddstr_in_color(row, 48, "Arm: ", color); } if (rogue.armor && (rogue.armor->d_enchant > MAX_ARMOR)) { rogue.armor->d_enchant = MAX_ARMOR; } ! sprintf(buf, "%d", get_armor_class(rogue.armor)); ! mvaddstr_in_color(row, 53, buf, color); pad(buf, 2); } if (stat_mask & STAT_EXP) { if (label) { ! mvaddstr_in_color(row, 56, "Exp: ", color); } if (rogue.exp_points > MAX_EXP) { *************** *** 306,336 **** } sprintf(buf, "%d/%ld", rogue.exp, rogue.exp_points); ! mvaddstr_in_color(row, 60, buf, ok_color); pad(buf, 11); } if (stat_mask & STAT_HUNGER) { ! /* Invert if hungry, warn if weak, shout if faint. Note that ! * if we're playing in color we use a bright white background ! * when hungry. ! */ ! move(row, 72); ! switch (hunger_str[0]) { ! case 'h': ! color = (use_color) ? MAKE_COLOR(BLACK,WHITE) : ! INVERT_COLOR(ok_color); ! break; ! case 'w': ! color = (use_color) ? INVERT_COLOR(warn_color) : ! MAKE_COLOR(BLACK,BRIGHT_WHITE); ! break; ! case 'f': ! color = INVERT_COLOR(danger_color); ! break; ! default: ! color = 0; ! } ! addstr_in_color(" ", color); ! addstr_in_color(hunger_str, color); ! addstr_in_color(" ", color); clrtoeol(); } --- 266,274 ---- } sprintf(buf, "%d/%ld", rogue.exp, rogue.exp_points); ! mvaddstr_in_color(row, 61, buf, color); pad(buf, 11); } if (stat_mask & STAT_HUNGER) { ! mvaddstr_in_color(row, 73, hunger_str, color); clrtoeol(); } Index: object.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/object.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** object.c 30 Jan 2004 20:33:03 -0000 1.3 --- object.c 14 Feb 2004 13:42:31 -0000 1.4 *************** *** 797,800 **** --- 797,801 ---- + #ifdef DISCOVERY /* NS: Shows a list of what's been discovered for each of the basic * object types. Under development. *************** *** 803,807 **** discovery() { ! /* object *obj; short i = 0, j, maxlen = 0, n; char bwdesc[DCOLS]; --- 804,808 ---- discovery() { ! object *obj; short i = 0, j, maxlen = 0, n; char bwdesc[DCOLS]; *************** *** 876,879 **** mvaddcstr(j, col, descs[j-1]); } - */ } --- 877,880 ---- mvaddcstr(j, col, descs[j-1]); } } + #endif Index: play.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/play.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** play.c 30 Jan 2004 20:33:03 -0000 1.3 --- play.c 14 Feb 2004 13:42:31 -0000 1.4 *************** *** 88,94 **** --- 88,96 ---- inventory(&rogue.pack, ALL_OBJECTS); break; + #ifdef DISCOVERY case 'D': discovery(); break; + #endif case 'f': fight(0); Index: rogue.h =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/rogue.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** rogue.h 31 Jan 2004 17:00:52 -0000 1.4 --- rogue.h 14 Feb 2004 13:42:31 -0000 1.5 *************** *** 390,401 **** #define STAT_ALL 0377 - #define STAT_LABELCOLOR MAKE_COLOR(BRIGHT_CYAN, BLACK) - #define STAT_OKCOLOR MAKE_COLOR(BRIGHT_CYAN, BLACK) - #define STAT_WARNCOLOR MAKE_COLOR(BRIGHT_YELLOW, BLACK) - #define STAT_DANGERCOLOR MAKE_COLOR(BRIGHT_RED, BLACK) - // #define PARTY_TIME 10 /* (NS - this is unused) one party somewhere in each 10 level span */ ! #define PARTY_PCT 7 /* NS - % of levels having a party room */ #define BIG_PARTY_PCT 1 /* NS - % of party rooms that are supersized */ --- 390,396 ---- #define STAT_ALL 0377 // #define PARTY_TIME 10 /* (NS - this is unused) one party somewhere in each 10 level span */ ! #define PARTY_PCT 8 /* NS - % of levels having a party room */ #define BIG_PARTY_PCT 1 /* NS - % of party rooms that are supersized */ *************** *** 404,408 **** #define HIDE_PERCENT 12 ! #define FRUIT_TYPE "mango" /* NS - more appetizing than slime molds */ struct tr { --- 399,404 ---- #define HIDE_PERCENT 12 ! #define FRUIT_TYPE "slime-mold" ! /*#define FRUIT_TYPE "mango"*/ /* NS - more appetizing than slime molds */ struct tr { Index: room.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/room.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** room.c 30 Jan 2004 20:33:03 -0000 1.4 --- room.c 14 Feb 2004 13:42:31 -0000 1.5 *************** *** 53,60 **** extern short halluc; extern boolean detect_monster, jump, passgo, display_skull; ! extern boolean enable_hypo, use_doschars, use_color; extern char *login_name, *fruit, *press_space; ! #define NOPTS 8 struct option { --- 53,60 ---- extern short halluc; extern boolean detect_monster, jump, passgo, display_skull; ! extern boolean use_doschars, use_color; extern char *login_name, *fruit, *press_space; ! #define NOPTS 7 struct option { *************** *** 79,86 **** }, { - "Allow death by hypothermia (\"hypo\"): ", - 1, (char **) 0, &enable_hypo, 0, 0 - }, - { "Play in color (\"color\"): ", 1, (char **) 0, &use_color, 0, 1 --- 79,82 ---- Index: spec_hit.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/spec_hit.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** spec_hit.c 30 Jan 2004 20:33:03 -0000 1.3 --- spec_hit.c 14 Feb 2004 13:42:31 -0000 1.4 *************** *** 130,137 **** } ! /* NS -- added at behest of my son John, who hates when his characters ! * die of hypothermia. :-) ! */ ! if (enable_hypo && rand_percent(freeze_percent)) { for (i = 0; i < 50; i++) { mv_mons(); --- 130,134 ---- } ! if (rand_percent(freeze_percent)) { for (i = 0; i < 50; i++) { mv_mons(); Index: version.h =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/version.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** version.h 28 Jun 2003 02:22:06 -0000 1.2 --- version.h 14 Feb 2004 13:42:31 -0000 1.3 *************** *** 1,39 **** ! /* ! #define VERSION_MAJOR 2 ! #define VERSION_MINOR 1 ! #define VERSION_PATCH 0 ! #define EXPERIMENTAL 0 ! ! #define STRINGIZE(x) #x ! ! #if VERSION_PATCH == 0 ! #define PATCH_STRING ! #else ! #define PATCH_STRING "." STRINGIZE(VERSION_PATCH) ! #endif ! ! #if EXPERIMENTAL == 0 ! #define DEV_STRING ! #else ! #define DEV_STRING " (in development)" ! #endif ! ! ! #define VERSION_STRING "DOS Rogue Clone version " STRINGIZE(VERSION_MAJOR) \ ! "." STRINGIZE(VERSION_MINOR) PATCH_STRING DEV_STRING ! #define LONG_VERSION_STRING VERSION_STRING " built " __DATE__ " " __TIME__ ! */ ! /* This eliminates all preprocessor headaches, especially as gcc seems ! * not to expand macro paramters before applying the stringizing (#) ! * operator. ! */ ! #define VERSION "2.1.0a" ! #define VERSION_STRING "DOS Rogue Clone version " VERSION ! #define LONG_VERSION_STRING VERSION_STRING " built " __DATE__ " " __TIME__ #define COPYRIGHT_LINE1 \ --- 1,26 ---- ! #define VERSION_MAJOR 2 ! #define VERSION_MINOR 1 ! #define VERSION_PATCH 0 ! #define EXPERIMENTAL 1 ! #define STRINGIZE(x) #x ! #define STR(x) STRINGIZE(x) ! #if VERSION_PATCH == 0 ! #define PATCH_STRING ! #else ! #define PATCH_STRING "." STR(VERSION_PATCH) ! #endif ! #if EXPERIMENTAL == 0 ! #define DEV_STRING ! #else ! #define DEV_STRING " (in development)" ! #endif + #define VERSION_STRING "Rogue Clone IV version " STR(VERSION_MAJOR) \ + "." STR(VERSION_MINOR) PATCH_STRING DEV_STRING + #define LONG_VERSION_STRING VERSION_STRING " built " __DATE__ " " __TIME__ #define COPYRIGHT_LINE1 \ *************** *** 45,72 **** /*****************************************************************************/ ! /* Version 2.1.0 NS */ /* ! * DOS Rogue Clone 2.1.0, June 14 2003 ! * now supports color graphics throughout. ! * uses PC-Rogue DOS characters and tombstone. ! * adapted to compile under gcc (and hopefully still under Watcom). ! * more sophisticated command line/environment options ! * fixed bug in dragon's fire-breathing aim. ! * fixed several bugs pertaining to object naming under gcc. */ - /* - * DOS Rogue Clone 2.1.0a, June 16 2003 - * less garish floor color when using traditional ASCII characters - * added option for hypothermia (my son hates it :-)) - * Now supports -? and -?? switches - * Save Screen always saves in ASCII characters. - * Objects appear on gray background in tunnels. - */ /*****************************************************************************/ ! /* Version 2.0.1 */ /* --- 32,52 ---- /*****************************************************************************/ ! /* Version 2.1.x */ /* ! * Rogue Clone IV 2.1.0, February ??, 2004 ! * now builds as a Windows console application as well as DOS ! * DOS port now compiles with Open Watcom and DJGPP (abandoned Watcom 7.0) ! * now supports color graphics throughout ! * uses PC-Rogue DOS characters ! * fixed bug in dragon's fire-breathing aim ! * fixed several bugs pertaining to object naming under gcc ! * Note: Nick Straguzzi did almost all the coding for this version */ /*****************************************************************************/ ! /* Version 2.0.x */ /* *************** *** 96,100 **** /*****************************************************************************/ ! /* Version 1.0.1 */ /* --- 76,80 ---- /*****************************************************************************/ ! /* Version 1.0.x */ /* |
|
From: <mle...@pr...> - 2004-01-31 17:02:36
|
Update of /cvsroot/rogueclone/rogue/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10757/src Modified Files: curses.c machdep.c rogue.h Log Message: Now builds as a Windows console application (with VC98). Index: curses.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/curses.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** curses.c 30 Jan 2004 20:33:03 -0000 1.4 --- curses.c 31 Jan 2004 17:00:52 -0000 1.5 *************** *** 45,49 **** */ ! /* NS, June 2003: Color Curses * * This is a modified version of the Rogue curses.c library that supports --- 45,52 ---- */ ! /* ! * ML, 31 Jan 2004: added support for win32 console applications ! * ! * NS, June 2003: Color Curses * * This is a modified version of the Rogue curses.c library that supports *************** *** 69,114 **** #include "rogue.h" - /* ============== COMPILER-SPECIFIC CONSTANTS AND TYPEDEFS =============== */ - /* --- For compiling under Open Watcom --- */ #ifdef __WATCOMC__ #include <dos.h> ! typedef union REGPACK regs_t; ! #define R_AX w.ax ! #define R_BX w.bx ! #define R_CX w.cx ! #define R_DX w.dx ! #define R_FLAGS w.flags ! ! /* WARNING: for 32-bit code, unused fields of regs_t ! must be zeroed before using this macro */ ! #define intr_fn(N,R) intr(N,R) - /* --- For compiling under djgpp --- */ #elif __DJGPP__ #include <dpmi.h> - typedef __dpmi_regs regs_t; ! #define R_AX x.ax ! #define R_BX x.bx ! #define R_CX x.cx ! #define R_DX x.dx ! #define R_FLAGS x.flags ! ! #define intr_fn(N,R) __dpmi_int(N,R) ! - /* --- Else you're on your own --- */ #else ! #error Sorry, curses.c compiles under Open Watcom or djgpp #endif - - /* ============== CONSTANTS AND TYPEDEFS =============== */ --- 72,98 ---- #include "rogue.h" /* ============== COMPILER-SPECIFIC CONSTANTS AND TYPEDEFS =============== */ #ifdef __WATCOMC__ #include <dos.h> + typedef union REGPACK regs_t; + #define intr_fn(N,R) intr(N,R) ! #elif _MSC_VER /* Microsoft C (tested with VC98) */ + #define WIN32_LEAN_AND_MEAN + #include <windows.h> #elif __DJGPP__ #include <dpmi.h> typedef __dpmi_regs regs_t; ! #define intr_fn(N,R) __dpmi_int(N,R) #else ! #error curses.c only compiles with Open Watcom, Microsoft C, or DJGPP #endif /* ============== CONSTANTS AND TYPEDEFS =============== */ *************** *** 120,125 **** ! typedef union _colorChar COLORBUF; ! #define BLANKCH MAKE_COLOR_CHAR(WHITE,BLACK,' ') --- 104,109 ---- ! typedef union _colorChar COLORBUF; ! #define BLANKCH MAKE_COLOR_CHAR(WHITE,BLACK,' ') *************** *** 129,133 **** int LINES=DROWS, COLS=DCOLS; - // static char terminal[DROWS][DCOLS]; // static char buffer[DROWS][DCOLS]; --- 113,116 ---- *************** *** 142,148 **** static WINDOW *curscr = &scr_buf; static short cur_row, cur_col; - static unsigned char videomode, videopage; - /* ================= PRIVATE PROTOTYPES ================= */ --- 125,134 ---- static WINDOW *curscr = &scr_buf; static short cur_row, cur_col; + #ifdef _MSC_VER + static HANDLE hStdIn, hStdOut; + #else + static unsigned char videomode, videopage; + #endif /* ================= PRIVATE PROTOTYPES ================= */ *************** *** 156,161 **** static wrefresh(WINDOW *scr); - - /* ================== PUBLIC FUNCTIONS ================== */ --- 142,145 ---- *************** *** 164,192 **** rgetchar() { ! register ch; register scancode; ! regs_t regs; ! ! for(;;) { ! regs.h.ah = 0x00; /* get keystroke */ ! intr_fn(0x16, ®s); ! scancode = regs.h.ah; /* BIOS scancode */ ! if(scancode>0x46 && scancode<0x54) ! ch = translate_keypad(scancode); ! else ! ch = regs.h.al; /* ASCII code */ ! switch(ch) { ! case '\022': /* ^R */ ! wrefresh(curscr); ! break; ! case '&': ! save_screen(); ! break; ! default: ! return(ch); ! } } } --- 148,227 ---- rgetchar() { ! register ch; ! #ifdef _MSC_VER ! INPUT_RECORD ir; ! DWORD n; ! ! put_cursor(curscr->_cury, curscr->_curx); ! #else register scancode; ! regs_t regs; ! #endif ! for(;;) { ! #ifdef _MSC_VER ! if(!ReadConsoleInput(hStdIn, &ir, 1, &n) || ! ir.EventType != KEY_EVENT || !ir.Event.KeyEvent.bKeyDown) ! continue; ! ! switch(ir.Event.KeyEvent.wVirtualKeyCode) { ! case VK_NUMPAD9: case VK_PRIOR: ! ir.Event.KeyEvent.uChar.AsciiChar = 'u'; break; ! case VK_NUMPAD3: case VK_NEXT: ! ir.Event.KeyEvent.uChar.AsciiChar = 'n'; break; ! case VK_NUMPAD1: case VK_END: ! ir.Event.KeyEvent.uChar.AsciiChar = 'b'; break; ! case VK_NUMPAD7: case VK_HOME: ! ir.Event.KeyEvent.uChar.AsciiChar = 'y'; break; ! case VK_NUMPAD4: case VK_LEFT: ! ir.Event.KeyEvent.uChar.AsciiChar = 'h'; break; ! case VK_NUMPAD8: case VK_UP: ! ir.Event.KeyEvent.uChar.AsciiChar = 'k'; break; ! case VK_NUMPAD6: case VK_RIGHT: ! ir.Event.KeyEvent.uChar.AsciiChar = 'l'; break; ! case VK_NUMPAD2: case VK_DOWN: ! ir.Event.KeyEvent.uChar.AsciiChar = 'j'; break; ! case VK_DELETE: ! ir.Event.KeyEvent.uChar.AsciiChar = '.'; break; ! } ! ! if((ir.Event.KeyEvent.wVirtualKeyCode>=VK_PRIOR && ! ir.Event.KeyEvent.wVirtualKeyCode<=VK_DOWN) || ! (ir.Event.KeyEvent.wVirtualKeyCode>=VK_NUMPAD1 && ! ir.Event.KeyEvent.wVirtualKeyCode<=VK_NUMPAD9)) { ! boolean scrolllock = ir.Event.KeyEvent.dwControlKeyState & ! SCROLLLOCK_ON; ! boolean shift = ir.Event.KeyEvent.dwControlKeyState & ! (SHIFT_PRESSED | LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED); ! ! if((scrolllock && !shift) || (!scrolllock && shift)) { ! /* convert to control character */ ! ir.Event.KeyEvent.uChar.AsciiChar -= ('a' - 1); ! } ! } ! if(!(ch = ir.Event.KeyEvent.uChar.AsciiChar)) ! continue; ! #else ! regs.h.ah = 0x00; /* get keystroke */ ! intr_fn(0x16, ®s); ! scancode = regs.h.ah; /* BIOS scancode */ ! ! if(scancode>0x46 && scancode<0x54) ! ch = translate_keypad(scancode); ! else ! ch = regs.h.al; /* ASCII code */ ! #endif ! switch(ch) { ! case '\022': /* ^R */ ! wrefresh(curscr); ! break; ! case '&': ! save_screen(); ! break; ! default: ! return(ch); } + } } *************** *** 196,200 **** initscr() { ! regs_t regs; regs.h.ah = 0x0F; --- 231,248 ---- initscr() { ! #ifdef _MSC_VER ! CONSOLE_SCREEN_BUFFER_INFO csbi; ! ! hStdOut = GetStdHandle(STD_OUTPUT_HANDLE); ! hStdIn = GetStdHandle(STD_INPUT_HANDLE); ! ! GetConsoleScreenBufferInfo(hStdOut, &csbi); ! COLS = csbi.dwSize.X; ! LINES = csbi.dwSize.Y; ! ! SetConsoleTitle("Rogue Clone IV"); ! SetConsoleMode(hStdIn, 0); ! #else ! regs_t regs; regs.h.ah = 0x0F; *************** *** 203,206 **** --- 251,255 ---- videopage = regs.h.bh; COLS = regs.h.ah; + #endif } *************** *** 395,399 **** clear() { ! cls(); fflush(stdout); cur_row = cur_col = 0; --- 444,448 ---- clear() { ! cls(); fflush(stdout); cur_row = cur_col = 0; *************** *** 439,447 **** draw_box(color_char cset[6], int ulrow, int ulcol, int height, int width) { ! int i; ! const int toprow = ulrow; ! const int bottomrow = ulrow + height - 1; ! const int leftcol = ulcol; ! const int rightcol = ulcol + width - 1; /* check for nonsense */ --- 488,496 ---- draw_box(color_char cset[6], int ulrow, int ulcol, int height, int width) { ! short i; ! const short toprow = ulrow; ! const short bottomrow = ulrow + height - 1; ! const short leftcol = ulcol; ! const short rightcol = ulcol + width - 1; /* check for nonsense */ *************** *** 542,545 **** --- 591,595 ---- /* Translates a numeric keypad press into the equivalent Rogue command. */ + #ifndef _MSC_VER static char translate_keypad(int scancode) { const char keys[] = "yku-h5l+bjn0."; *************** *** 557,561 **** return keys[scancode-0x47]; } ! --- 607,611 ---- return keys[scancode-0x47]; } ! #endif *************** *** 573,590 **** static put_color_char_at(register int row, register int col, COLORBUF cb) { ! regs_t regs; ! ! put_cursor(row, col); regs.h.ah = 0x09; ! // regs.h.al = (ch & ~ST_MASK); ! regs.h.al = cb.b8.ch; regs.h.bh = videopage; ! // regs.h.bl = (ch & ST_MASK) ? 0x0f : 0x07; regs.h.bl = cb.b8.color; regs.x.cx = 1; intr_fn(0x10, ®s); ! ! terminal[row][col].b16 = cb.b16; } --- 623,655 ---- static put_color_char_at(register int row, register int col, COLORBUF cb) { ! #ifdef _MSC_VER ! COORD coord; ! WORD attrib; ! DWORD n; ! #else ! regs_t regs; ! ! put_cursor(row, col); ! #endif ! ! #ifdef _MSC_VER ! coord.X = col; ! coord.Y = row; ! attrib = cb.b8.color; + WriteConsoleOutputCharacter(hStdOut, &cb.b8.ch, 1, coord, &n); + WriteConsoleOutputAttribute(hStdOut, &attrib, 1, coord, &n); + #else regs.h.ah = 0x09; ! // regs.h.al = (ch & ~ST_MASK); ! regs.h.al = cb.b8.ch; regs.h.bh = videopage; ! // regs.h.bl = (ch & ST_MASK) ? 0x0f : 0x07; regs.h.bl = cb.b8.color; regs.x.cx = 1; intr_fn(0x10, ®s); ! #endif ! ! terminal[row][col].b16 = cb.b16; } *************** *** 594,598 **** static put_cursor(register int row, register int col) { ! regs_t regs; regs.h.ah = 0x02; --- 659,671 ---- static put_cursor(register int row, register int col) { ! #ifdef _MSC_VER ! COORD coord; ! ! coord.X = col; ! coord.Y = row; ! ! SetConsoleCursorPosition(hStdOut, coord); ! #else ! regs_t regs; regs.h.ah = 0x02; *************** *** 601,604 **** --- 674,678 ---- regs.h.bh = videopage; intr_fn(0x10, ®s); + #endif } *************** *** 629,637 **** static cls() { ! regs_t regs; regs.h.ah = 0x00; regs.h.al = videomode; intr_fn(0x10, ®s); } --- 703,720 ---- static cls() { ! #ifdef _MSC_VER ! COORD coord; ! DWORD n; ! ! coord.X = coord.Y = 0; ! FillConsoleOutputCharacter(hStdOut, ' ', LINES*COLS, coord, &n); ! FillConsoleOutputAttribute(hStdOut, WHITE, LINES*COLS, coord, &n); ! #else ! regs_t regs; regs.h.ah = 0x00; regs.h.al = videomode; intr_fn(0x10, ®s); + #endif } *************** *** 654,660 **** --- 737,745 ---- col++; } + #ifndef _MSC_VER if (col < DCOLS) { put_cursor(i, col); } + #endif while ((col < DCOLS) && (buffer[i][col].b16 != BLANKCH)) { put_color_char_at(i, col, buffer[i][col]); Index: machdep.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/machdep.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** machdep.c 30 Jan 2004 20:33:03 -0000 1.3 --- machdep.c 31 Jan 2004 17:00:52 -0000 1.4 *************** *** 48,63 **** * of #ifdef's will be used to compile the appropriate code on each system: * - * MSDOS all MSDOS systems * __WATCOMC__ Open Watcom - * __BORLANDC__ Borland C * _MSC_VER Microsoft C * __DJGPP__ djgpp version 2 and above - * __SC__ Symantec C * ! * All DOS code should be included between the single "#ifdef MSDOS" at the ! * top of this file, and the "#endif" at the bottom. ! * ! * To change a routine to include a new DOS system, simply #ifdef the ! * existing routine, as in the following example: * * To make a routine compatible with Turbo C, change the first function --- 48,57 ---- * of #ifdef's will be used to compile the appropriate code on each system: * * __WATCOMC__ Open Watcom * _MSC_VER Microsoft C * __DJGPP__ djgpp version 2 and above * ! * To change a routine to include a new system, simply #ifdef the existing ! * routine, as in the following example: * * To make a routine compatible with Turbo C, change the first function *************** *** 86,91 **** */ - #ifdef MSDOS - #include <stdio.h> #include <conio.h> --- 80,83 ---- *************** *** 99,102 **** --- 91,99 ---- #include "version.h" + #ifdef _MSC_VER + #define WIN32_LEAN_AND_MEAN + #include <windows.h> + #endif + /* md_slurp: * *************** *** 113,118 **** --- 110,119 ---- md_slurp() { + #ifdef _MSC_VER + FlushConsoleInputBuffer(GetStdHandle(STD_INPUT_HANDLE)); + #else while(kbhit()) rgetchar(); + #endif } *************** *** 482,485 **** spawnl(P_WAIT, shell, shell, NULL); } - - #endif --- 483,484 ---- Index: rogue.h =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/rogue.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** rogue.h 30 Jan 2004 20:33:03 -0000 1.3 --- rogue.h 31 Jan 2004 17:00:52 -0000 1.4 *************** *** 44,47 **** --- 44,53 ---- */ + #ifdef _MSC_VER + /* supress warnings about parameters and return values, + * at least until we write proper prototypes */ + #pragma warning(disable:4033 4716 4113) + #endif + typedef unsigned char boolean; typedef unsigned char byte; |
|
From: <mle...@pr...> - 2004-01-31 17:02:35
|
Update of /cvsroot/rogueclone/rogue/dist In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10757/dist Removed Files: rogue.ico Log Message: Now builds as a Windows console application (with VC98). --- rogue.ico DELETED --- |
|
From: <mle...@pr...> - 2004-01-31 17:01:55
|
Update of /cvsroot/rogueclone/rogue/sys In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10150 Modified Files: setup.bat Added Files: makefile.msc rogue.ico rogue.rc Log Message: Now builds as a Windows console application (with VC98). --- NEW FILE: makefile.msc --- # NMAKE Makefile for VC98 CFLAGS = /nologo #want /W4 LDFLAGS = /nologo /warn:3 LDLIBS = src = src h = src obj = o exe = exe sys = sys game = rogue object_files = $(obj)/curses.obj $(obj)/hit.obj $(obj)/init.obj \ $(obj)/invent.obj $(obj)/level.obj $(obj)/machdep.obj $(obj)/main.obj \ $(obj)/message.obj $(obj)/monster.obj $(obj)/move.obj $(obj)/object.obj \ $(obj)/pack.obj $(obj)/play.obj $(obj)/random.obj $(obj)/ring.obj \ $(obj)/room.obj $(obj)/save.obj $(obj)/score.obj $(obj)/spec_hit.obj \ $(obj)/throw.obj $(obj)/trap.obj $(obj)/use.obj $(obj)/zap.obj resources = $(sys)/rogue.ico ############################################################################### # rules $(game) : $(exe)\$(game).exe ; $(exe)\$(game).exe : $(object_files) $(obj)/rogue.res @link /out:$@ $(LDFLAGS) $** $(LDLIBS) $(obj)/$(game).res : $(sys)/$(game).rc $(resources) @$(RC) -fo $@ $(sys)/$(game).rc #implicit rule for the ansi source files {$(src)}.c{$(obj)}.obj: @$(CC) /c $(CFLAGS) /Fo$(obj)\ /Za $< #explicit rule for the non-ansi source files $(obj)\curses.obj : $(src)\curses.c $(h)\rogue.h @$(CC) /c $(CFLAGS) /Fo$(obj)\ $(src)\$(@B).c $(obj)\machdep.obj : $(src)\machdep.c $(h)\rogue.h $(h)\paths.h $(h)\version.h @$(CC) /c $(CFLAGS) /Fo$(obj)\ $(src)\$(@B).c ############################################################################### # housekeeping spotless : clean @if exist $(exe)\$(game).exe del $(exe)\$(game).exe @if exist $(exe)\rogue.sco del $(exe)\rogue.sco @if exist $(exe)\rogue.sav del $(exe)\rogue.sav @if exist $(exe)\screen.txt del $(exe)\screen.txt clean : @if exist $(obj)\curses.obj del $(obj)\curses.obj @if exist $(obj)\hit.obj del $(obj)\hit.obj @if exist $(obj)\init.obj del $(obj)\init.obj @if exist $(obj)\invent.obj del $(obj)\invent.obj @if exist $(obj)\level.obj del $(obj)\level.obj @if exist $(obj)\machdep.obj del $(obj)\machdep.obj @if exist $(obj)\main.obj del $(obj)\main.obj @if exist $(obj)\message.obj del $(obj)\message.obj @if exist $(obj)\monster.obj del $(obj)\monster.obj @if exist $(obj)\move.obj del $(obj)\move.obj @if exist $(obj)\object.obj del $(obj)\object.obj @if exist $(obj)\pack.obj del $(obj)\pack.obj @if exist $(obj)\play.obj del $(obj)\play.obj @if exist $(obj)\random.obj del $(obj)\random.obj @if exist $(obj)\ring.obj del $(obj)\ring.obj @if exist $(obj)\rogue.res del $(obj)\rogue.res @if exist $(obj)\room.obj del $(obj)\room.obj @if exist $(obj)\save.obj del $(obj)\save.obj @if exist $(obj)\score.obj del $(obj)\score.obj @if exist $(obj)\spec_hit.obj del $(obj)\spec_hit.obj @if exist $(obj)\throw.obj del $(obj)\throw.obj @if exist $(obj)\trap.obj del $(obj)\trap.obj @if exist $(obj)\use.obj del $(obj)\use.obj @if exist $(obj)\zap.obj del $(obj)\zap.obj --- NEW FILE: rogue.ico --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rogue.rc --- /* VC98 resource script */ 101 ICON rogue.ico Index: setup.bat =================================================================== RCS file: /cvsroot/rogueclone/rogue/sys/setup.bat,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** setup.bat 28 Jun 2003 15:38:53 -0000 1.1 --- setup.bat 31 Jan 2004 17:00:11 -0000 1.2 *************** *** 1,7 **** @echo off ! rem batch file to prepare rogue clone for compilation under DOS rem invoke from sys subdirectory, ex: setup wcc - rem todo: add support for Borland C, Digital Mars, Pacific C, Microsoft C if exist setup.bat goto compiler --- 1,6 ---- @echo off ! rem batch file to prepare rogue clone for compilation under DOS or Windows rem invoke from sys subdirectory, ex: setup wcc if exist setup.bat goto compiler *************** *** 12,19 **** --- 11,20 ---- if "%1"=="wcc" goto WATCOM if "%1"=="gcc" goto DJGPP + if "%1"=="msc" goto MICROSOFT echo Usage: setup compiler echo supported compilers: echo wcc - Open Watcom echo gcc - DJGPP + echo msc - Microsoft C goto end *************** *** 28,31 **** --- 29,37 ---- goto common + :MICROSOFT + echo Setting up for Microsoft C... + set makefile=makefile.msc + goto common + :common echo Copying Makefile... |
Update of /cvsroot/rogueclone/rogue/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18761/src Modified Files: curses.c hit.c init.c invent.c level.c machdep.c main.c message.c monster.c move.c object.c pack.c paths.h play.c random.c ring.c rogue.h room.c save.c score.c spec_hit.c throw.c trap.c use.c zap.c Log Message: Deleted obnoxious advertising clause from license. ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change Index: curses.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/curses.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** curses.c 28 Jun 2003 15:38:52 -0000 1.3 --- curses.c 30 Jan 2004 20:33:03 -0000 1.4 *************** *** 14,22 **** * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. All advertising materials mentioning features or use of this software ! * must display the following acknowledgement: ! * This product includes software developed by the University of ! * California, Berkeley and its contributors. ! * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. --- 14,18 ---- * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. Index: hit.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/hit.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** hit.c 28 Jun 2003 02:22:06 -0000 1.2 --- hit.c 30 Jan 2004 20:33:03 -0000 1.3 *************** *** 14,22 **** * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. All advertising materials mentioning features or use of this software ! * must display the following acknowledgement: ! * This product includes software developed by the University of ! * California, Berkeley and its contributors. ! * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. --- 14,18 ---- * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. Index: init.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/init.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** init.c 28 Jun 2003 02:22:06 -0000 1.2 --- init.c 30 Jan 2004 20:33:03 -0000 1.3 *************** *** 14,22 **** * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. All advertising materials mentioning features or use of this software ! * must display the following acknowledgement: ! * This product includes software developed by the University of ! * California, Berkeley and its contributors. ! * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. --- 14,18 ---- * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. Index: invent.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/invent.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** invent.c 28 Jun 2003 02:22:06 -0000 1.2 --- invent.c 30 Jan 2004 20:33:03 -0000 1.3 *************** *** 14,22 **** * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. All advertising materials mentioning features or use of this software ! * must display the following acknowledgement: ! * This product includes software developed by the University of ! * California, Berkeley and its contributors. ! * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. --- 14,18 ---- * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. Index: level.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/level.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** level.c 28 Jun 2003 02:22:06 -0000 1.2 --- level.c 30 Jan 2004 20:33:03 -0000 1.3 *************** *** 14,22 **** * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. All advertising materials mentioning features or use of this software ! * must display the following acknowledgement: ! * This product includes software developed by the University of ! * California, Berkeley and its contributors. ! * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. --- 14,18 ---- * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. Index: machdep.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/machdep.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** machdep.c 28 Jun 2003 15:38:52 -0000 1.2 --- machdep.c 30 Jan 2004 20:33:03 -0000 1.3 *************** *** 14,22 **** * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. All advertising materials mentioning features or use of this software ! * must display the following acknowledgement: ! * This product includes software developed by the University of ! * California, Berkeley and its contributors. ! * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. --- 14,18 ---- * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. Index: main.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/main.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** main.c 18 Jun 2003 18:22:21 -0000 1.1.1.1 --- main.c 30 Jan 2004 20:33:03 -0000 1.2 *************** *** 14,22 **** * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. All advertising materials mentioning features or use of this software ! * must display the following acknowledgement: ! * This product includes software developed by the University of ! * California, Berkeley and its contributors. ! * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. --- 14,18 ---- * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. Index: message.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/message.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** message.c 28 Jun 2003 02:22:06 -0000 1.2 --- message.c 30 Jan 2004 20:33:03 -0000 1.3 *************** *** 14,22 **** * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. All advertising materials mentioning features or use of this software ! * must display the following acknowledgement: ! * This product includes software developed by the University of ! * California, Berkeley and its contributors. ! * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. --- 14,18 ---- * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. Index: monster.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/monster.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** monster.c 28 Jun 2003 02:22:06 -0000 1.2 --- monster.c 30 Jan 2004 20:33:03 -0000 1.3 *************** *** 14,22 **** * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. All advertising materials mentioning features or use of this software ! * must display the following acknowledgement: ! * This product includes software developed by the University of ! * California, Berkeley and its contributors. ! * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. --- 14,18 ---- * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. Index: move.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/move.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** move.c 28 Jun 2003 02:22:06 -0000 1.2 --- move.c 30 Jan 2004 20:33:03 -0000 1.3 *************** *** 14,22 **** * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. All advertising materials mentioning features or use of this software ! * must display the following acknowledgement: ! * This product includes software developed by the University of ! * California, Berkeley and its contributors. ! * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. --- 14,18 ---- * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. Index: object.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/object.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** object.c 28 Jun 2003 02:22:06 -0000 1.2 --- object.c 30 Jan 2004 20:33:03 -0000 1.3 *************** *** 14,22 **** * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. All advertising materials mentioning features or use of this software ! * must display the following acknowledgement: ! * This product includes software developed by the University of ! * California, Berkeley and its contributors. ! * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. --- 14,18 ---- * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. Index: pack.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/pack.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** pack.c 18 Jun 2003 18:22:16 -0000 1.1.1.1 --- pack.c 30 Jan 2004 20:33:03 -0000 1.2 *************** *** 14,22 **** * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. All advertising materials mentioning features or use of this software ! * must display the following acknowledgement: ! * This product includes software developed by the University of ! * California, Berkeley and its contributors. ! * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. --- 14,18 ---- * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. Index: paths.h =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/paths.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** paths.h 18 Jun 2003 18:22:15 -0000 1.1.1.1 --- paths.h 30 Jan 2004 20:33:03 -0000 1.2 *************** *** 11,19 **** * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. All advertising materials mentioning features or use of this software ! * must display the following acknowledgement: ! * This product includes software developed by the University of ! * California, Berkeley and its contributors. ! * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. --- 11,15 ---- * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. Index: play.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/play.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** play.c 28 Jun 2003 02:22:06 -0000 1.2 --- play.c 30 Jan 2004 20:33:03 -0000 1.3 *************** *** 14,22 **** * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. All advertising materials mentioning features or use of this software ! * must display the following acknowledgement: ! * This product includes software developed by the University of ! * California, Berkeley and its contributors. ! * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. --- 14,18 ---- * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. Index: random.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/random.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** random.c 18 Jun 2003 18:22:15 -0000 1.1.1.1 --- random.c 30 Jan 2004 20:33:03 -0000 1.2 *************** *** 14,22 **** * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. All advertising materials mentioning features or use of this software ! * must display the following acknowledgement: ! * This product includes software developed by the University of ! * California, Berkeley and its contributors. ! * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. --- 14,18 ---- * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. Index: ring.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/ring.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** ring.c 18 Jun 2003 18:22:15 -0000 1.1.1.1 --- ring.c 30 Jan 2004 20:33:03 -0000 1.2 *************** *** 14,22 **** * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. All advertising materials mentioning features or use of this software ! * must display the following acknowledgement: ! * This product includes software developed by the University of ! * California, Berkeley and its contributors. ! * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. --- 14,18 ---- * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. Index: rogue.h =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/rogue.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** rogue.h 28 Jun 2003 02:22:06 -0000 1.2 --- rogue.h 30 Jan 2004 20:33:03 -0000 1.3 *************** *** 14,22 **** * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. All advertising materials mentioning features or use of this software ! * must display the following acknowledgement: ! * This product includes software developed by the University of ! * California, Berkeley and its contributors. ! * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. --- 14,18 ---- * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. Index: room.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/room.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** room.c 28 Jun 2003 15:38:52 -0000 1.3 --- room.c 30 Jan 2004 20:33:03 -0000 1.4 *************** *** 14,22 **** * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. All advertising materials mentioning features or use of this software ! * must display the following acknowledgement: ! * This product includes software developed by the University of ! * California, Berkeley and its contributors. ! * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. --- 14,18 ---- * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. Index: save.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/save.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** save.c 28 Jun 2003 15:38:52 -0000 1.2 --- save.c 30 Jan 2004 20:33:03 -0000 1.3 *************** *** 14,22 **** * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. All advertising materials mentioning features or use of this software ! * must display the following acknowledgement: ! * This product includes software developed by the University of ! * California, Berkeley and its contributors. ! * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. --- 14,18 ---- * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. Index: score.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/score.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** score.c 28 Jun 2003 15:38:52 -0000 1.3 --- score.c 30 Jan 2004 20:33:03 -0000 1.4 *************** *** 14,22 **** * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. All advertising materials mentioning features or use of this software ! * must display the following acknowledgement: ! * This product includes software developed by the University of ! * California, Berkeley and its contributors. ! * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. --- 14,18 ---- * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. Index: spec_hit.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/spec_hit.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** spec_hit.c 28 Jun 2003 02:22:06 -0000 1.2 --- spec_hit.c 30 Jan 2004 20:33:03 -0000 1.3 *************** *** 14,22 **** * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. All advertising materials mentioning features or use of this software ! * must display the following acknowledgement: ! * This product includes software developed by the University of ! * California, Berkeley and its contributors. ! * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. --- 14,18 ---- * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. Index: throw.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/throw.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** throw.c 28 Jun 2003 02:22:06 -0000 1.2 --- throw.c 30 Jan 2004 20:33:03 -0000 1.3 *************** *** 14,22 **** * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. All advertising materials mentioning features or use of this software ! * must display the following acknowledgement: ! * This product includes software developed by the University of ! * California, Berkeley and its contributors. ! * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. --- 14,18 ---- * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. Index: trap.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/trap.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** trap.c 28 Jun 2003 02:22:06 -0000 1.2 --- trap.c 30 Jan 2004 20:33:03 -0000 1.3 *************** *** 14,22 **** * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. All advertising materials mentioning features or use of this software ! * must display the following acknowledgement: ! * This product includes software developed by the University of ! * California, Berkeley and its contributors. ! * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. --- 14,18 ---- * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. Index: use.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/use.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** use.c 28 Jun 2003 02:22:06 -0000 1.2 --- use.c 30 Jan 2004 20:33:03 -0000 1.3 *************** *** 14,22 **** * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. All advertising materials mentioning features or use of this software ! * must display the following acknowledgement: ! * This product includes software developed by the University of ! * California, Berkeley and its contributors. ! * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. --- 14,18 ---- * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. Index: zap.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/zap.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** zap.c 28 Jun 2003 15:38:52 -0000 1.3 --- zap.c 30 Jan 2004 20:33:03 -0000 1.4 *************** *** 14,22 **** * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. All advertising materials mentioning features or use of this software ! * must display the following acknowledgement: ! * This product includes software developed by the University of ! * California, Berkeley and its contributors. ! * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. --- 14,18 ---- * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. ! * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. |
|
From: <mle...@pr...> - 2004-01-30 20:34:39
|
Update of /cvsroot/rogueclone/rogue/dist In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18761/dist Modified Files: license.txt Log Message: Deleted obnoxious advertising clause from license. ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change Index: license.txt =================================================================== RCS file: /cvsroot/rogueclone/rogue/dist/license.txt,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** license.txt 18 Jun 2003 18:22:02 -0000 1.1.1.1 --- license.txt 30 Jan 2004 20:33:02 -0000 1.2 *************** *** 10,18 **** notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. ! 3. All advertising materials mentioning features or use of this software ! must display the following acknowledgement: ! This product includes software developed by the University of ! California, Berkeley and its contributors. ! 4. Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. --- 10,14 ---- notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. ! 3. Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. |
|
From: <mle...@pr...> - 2004-01-30 20:34:38
|
Update of /cvsroot/rogueclone/rogue/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18761/doc Modified Files: guide.html rogue.html Log Message: Deleted obnoxious advertising clause from license. ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change Index: guide.html =================================================================== RCS file: /cvsroot/rogueclone/rogue/doc/guide.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** guide.html 30 Jan 2004 18:02:16 -0000 1.2 --- guide.html 30 Jan 2004 20:33:03 -0000 1.3 *************** *** 15,23 **** notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. ! 3. All advertising materials mentioning features or use of this software ! must display the following acknowledgement: ! This product includes software developed by the University of ! California, Berkeley and its contributors. ! 4. Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. --- 15,19 ---- notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. ! 3. Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. Index: rogue.html =================================================================== RCS file: /cvsroot/rogueclone/rogue/doc/rogue.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** rogue.html 30 Jan 2004 18:02:16 -0000 1.2 --- rogue.html 30 Jan 2004 20:33:03 -0000 1.3 *************** *** 15,23 **** notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. ! 3. All advertising materials mentioning features or use of this software ! must display the following acknowledgement: ! This product includes software developed by the University of ! California, Berkeley and its contributors. ! 4. Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. --- 15,19 ---- notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. ! 3. Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. |
1 message has been excluded from this view by a project administrator.
