Get a bit further with gcc3 - no more multiline string constants in

the C source in the distribution.  There are still multi-line C
strings in the generated C source, but I'll leave that for someone
more versed in Perl than I am.

4 files changed, 577 insertions, 1 deletions

diff --git a/games/minami/distinfo b/games/minami/distinfo
index 1c001256b84..c6efe43345a 100644
--- a/games/minami/distinfo
+++ b/games/minami/distinfo
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.4 2002/11/15 00:23:48 jlam Exp $
+$NetBSD: distinfo,v 1.5 2004/01/19 08:45:48 agc Exp $
 
 SHA1 (minami-1.0.2.tgz) = c64f0e7dfd29e9cf6569a37ad0c21639c0ddf070
 Size (minami-1.0.2.tgz) = 89527 bytes
 SHA1 (patch-aa) = 72b8b91d8a9a1926054c677ef6de959af1494500
 SHA1 (patch-ab) = 084ba46c1c7ddaa00d8624f6e896acac35b4d395
+SHA1 (patch-ac) = e94288b6bf92d00eed3b315c2b5e18940e1e96eb
+SHA1 (patch-ad) = 090f186b5292ca99dbdef267a82faa2ab21586a4
+SHA1 (patch-ae) = 51da678696ac130c184f35811d833f4ab214a08a
 SHA1 (patch-af) = 55e015142821cc8abffc0852c264b68d2f46c280
diff --git a/games/minami/patches/patch-ac b/games/minami/patches/patch-ac
new file mode 100644
index 00000000000..c5182e91eac
--- /dev/null
+++ b/games/minami/patches/patch-ac
@@ -0,0 +1,165 @@
+$NetBSD: patch-ac,v 1.3 2004/01/19 08:45:48 agc Exp $
+
+--- action.c	2004/01/19 00:15:08	1.1
++++ action.c	2004/01/19 00:18:13
+@@ -36,8 +36,8 @@
+ hook_action_talk(int cur_scene, const char *verb, const char *obj)
+ {
+     if(you.f_ignore_talk){
+-	fmtmsg("話しかけようとしたが，あなたは無視された。
+-着ているものがいけないような気がする。", obj);
++	fmtmsg("話しかけようとしたが，あなたは無視された。\n"
++"着ているものがいけないような気がする。", obj);
+ 	return MIN_OK;
+     }
+     
+@@ -102,80 +102,80 @@
+ int
+ def_action_help(int cur_scene, const char *verb, const char *obj)
+ {
+-    fmtmsg("
+-コマンドは基本的に
+-
+-[動詞] [目的語]
+-
+-で指示する。大文字小文字は無視される。
+-目的語を省略すると適当な相手が選ばれる。
+-よく使うコマンドは一文字をタイプするだけでよい。
+-
+---よく使うコマンド--
+-
+-$bH$nelp または ? :この文章を表示
+-$bE$nast            :東へ歩く
+-$bW$nest            :西へ歩く
+-$bN$north           :北へ歩く
+-$bS$nouth           :南へ歩く
+-$bI$nnventory	:所持金/持ち物表示
+-Enter		:中に入る
+-Exit		:中から出る
+-Look		:あたりを見わたす
+-Use		:道具を使用する/武器を装備する
+-Wear/Put on	:着る/被る
+-Take off	:脱ぐ/武器の装備を解く
+-Buy		:買う
+-Open		:開ける
+-Close		:閉じる
+-
+-License		:ゲームのライセンスの表示
+-Version		:バージョンの表示
+-
+-Save <file>	:ゲームを<file>に保存して中断する
+-$P
+-ホームディレクトリに .minamircというファイルを置くことにより，
+-自分の名前やラスボスの名前を変えることができる。
+-
+---設定例--
+-name=一成
+-friend=智子
+-nemesis=社長
+-");
++    fmtmsg("\n"
++"コマンドは基本的に\n"
++"\n"
++"[動詞] [目的語]\n"
++"\n"
++"で指示する。大文字小文字は無視される。\n"
++"目的語を省略すると適当な相手が選ばれる。\n"
++"よく使うコマンドは一文字をタイプするだけでよい。\n"
++"\n"
++"--よく使うコマンド--\n"
++"\n"
++"$bH$nelp または ? :この文章を表示\n"
++"$bE$nast            :東へ歩く\n"
++"$bW$nest            :西へ歩く\n"
++"$bN$north           :北へ歩く\n"
++"$bS$nouth           :南へ歩く\n"
++"$bI$nnventory	:所持金/持ち物表示\n"
++"Enter		:中に入る\n"
++"Exit		:中から出る\n"
++"Look		:あたりを見わたす\n"
++"Use		:道具を使用する/武器を装備する\n"
++"Wear/Put on	:着る/被る\n"
++"Take off	:脱ぐ/武器の装備を解く\n"
++"Buy		:買う\n"
++"Open		:開ける\n"
++"Close		:閉じる\n"
++"\n"
++"License		:ゲームのライセンスの表示\n"
++"Version		:バージョンの表示\n"
++"\n"
++"Save <file>	:ゲームを<file>に保存して中断する\n"
++"$P\n"
++"ホームディレクトリに .minamircというファイルを置くことにより，\n"
++"自分の名前やラスボスの名前を変えることができる。\n"
++"\n"
++"--設定例--\n"
++"name=一成\n"
++"friend=智子\n"
++"nemesis=社長\n"
++);
+     return cur_scene;
+ }
+ 
+ int
+ def_action_license(int cur_scene, const char *verb, const char *obj)
+ {
+-    rawmsg("
+-MINAMI SHINJUKU ADVENTURE
+-
+-Copyright (c) 2001
+-    Issei Numata and ASCII CORPORATION. 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,
+-   verbatim and that no modifications are made prior to this
+-   point in the file.
+-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.
+-
+-THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``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 AUTHORS OR THEIR PETS 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, LIFE 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.
+-");
++    rawmsg("\n"
++"MINAMI SHINJUKU ADVENTURE\n"
++"\n"
++"Copyright (c) 2001\n"
++"    Issei Numata and ASCII CORPORATION. All rights reserved.\n"
++"\n"
++"Redistribution and use in source and binary forms, with or without\n"
++"modification, are permitted provided that the following conditions\n"
++"are met:\n"
++"1. Redistributions of source code must retain the above copyright\n"
++"   notice, this list of conditions and the following disclaimer,\n"
++"   verbatim and that no modifications are made prior to this\n"
++"   point in the file.\n"
++"2. Redistributions in binary form must reproduce the above copyright\n"
++"   notice, this list of conditions and the following disclaimer in the\n"
++"   documentation and/or other materials provided with the distribution.\n"
++"\n"
++"THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND\n"
++"ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n"
++"IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n"
++"ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR THEIR PETS BE LIABLE\n"
++"FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\n"
++"DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS\n"
++"OR SERVICES; LOSS OF USE, DATA, LIFE OR PROFITS; OR BUSINESS INTERRUPTION)\n"
++"HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT\n"
++"LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n"
++"OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF\n"
++"SUCH DAMAGE.\n"
++);
+     return cur_scene;
+ }
diff --git a/games/minami/patches/patch-ad b/games/minami/patches/patch-ad
new file mode 100644
index 00000000000..6e55495e6d5
--- /dev/null
+++ b/games/minami/patches/patch-ad
@@ -0,0 +1,387 @@
+$NetBSD: patch-ad,v 1.3 2004/01/19 08:45:48 agc Exp $
+
+--- misc.c	2004/01/19 08:12:47	1.1
++++ misc.c	2004/01/19 08:30:17
+@@ -285,209 +285,209 @@
+     if(typ == 0){
+ 	switch(n){
+ 	case 1:
+-	    fmtmsg("
+-        -----   -----
+-        |   |   |   |
+-        |   |   | > |
+-        |   |   |   |
+-        --+--   -----
+-          #
+------   --+--   -----
+-|   |   |   |   |   |
+-|   +###+   +###+   |
+-|   |   |   |   |   |
+---+--   -----   --+--
+-  #               #
+---+--   -----   --+--
+-|   |   |   |   |   |
+-|<  |   |<  |   |  >|
+-|   |   |   |   |   |
+------   --#--   -----
+-          #
+-###########
+-");
++	    fmtmsg("\n"
++"        -----   -----\n"
++"        |   |   |   |\n"
++"        |   |   | > |\n"
++"        |   |   |   |\n"
++"        --+--   -----\n"
++"          #\n"
++"-----   --+--   -----\n"
++"|   |   |   |   |   |\n"
++"|   +###+   +###+   |\n"
++"|   |   |   |   |   |\n"
++"--+--   -----   --+--\n"
++"  #               #\n"
++"--+--   -----   --+--\n"
++"|   |   |   |   |   |\n"
++"|<  |   |<  |   |  >|\n"
++"|   |   |   |   |   |\n"
++"-----   --#--   -----\n"
++"          #\n"
++"###########\n"
++);
+ 	    break;
+ 	case 2:
+-	    fmtmsg("
+------   -----   -----
+-|   |   |   |   |   |
+-|   +###+   |   | < |
+-|   |   |   |   |   |
+---+--   --+--   --+--
+-  #       #       #
+---+--   --+--   --+--
+-|   |   |   |   |   |
+-|   |   |   +###+   |
+-|   |   |   |   |   |
+---+--   -----   --+--
+-  #               #
+---+--   -----   --+--
+-|   |   |   |   |   |
+-| > |   |< >|   | < |
+-|   |   |   |   |   |
+------   -----   -----
+-");
++	    fmtmsg("\n"
++"-----   -----   -----\n"
++"|   |   |   |   |   |\n"
++"|   +###+   |   | < |\n"
++"|   |   |   |   |   |\n"
++"--+--   --+--   --+--\n"
++"  #       #       #\n"
++"--+--   --+--   --+--\n"
++"|   |   |   |   |   |\n"
++"|   |   |   +###+   |\n"
++"|   |   |   |   |   |\n"
++"--+--   -----   --+--\n"
++"  #               #\n"
++"--+--   -----   --+--\n"
++"|   |   |   |   |   |\n"
++"| > |   |< >|   | < |\n"
++"|   |   |   |   |   |\n"
++"-----   -----   -----\n"
++);
+ 	    break;
+ 	case 3:
+-	    fmtmsg("
+-        -----   -----
+-        |   |   |   |
+-        | { +###+   |
+-        |   |   |   |
+-        --+--   -----
+-          #
+------   --+--   -----
+-|   |   |   |   |   |
+-|   +###+   +###+   |
+-|   |   |   |   |   |
+---+--   -----   --+--
+-  #               #
+---+--   -----   --+--
+-|   |   |   |   |   |
+-|<  |   |< >|   |  >|
+-|   |   |   |   |   |
+------   -----   -----
+-");
++	    fmtmsg("\n"
++"        -----   -----\n"
++"        |   |   |   |\n"
++"        | { +###+   |\n"
++"        |   |   |   |\n"
++"        --+--   -----\n"
++"          #\n"
++"-----   --+--   -----\n"
++"|   |   |   |   |   |\n"
++"|   +###+   +###+   |\n"
++"|   |   |   |   |   |\n"
++"--+--   -----   --+--\n"
++"  #               #\n"
++"--+--   -----   --+--\n"
++"|   |   |   |   |   |\n"
++"|<  |   |< >|   |  >|\n"
++"|   |   |   |   |   |\n"
++"-----   -----   -----\n"
++);
+ 	    break;
+ 	case 4:
+-	    fmtmsg("
+------   -----   -----
+-|   |   |   |   |   |
+-|   +###+   +###+  >|
+-|   |   |   |   |   |
+---+--   --+--   --+--
+-  #       #       #
+---+--   --+--   --+--
+-|   |   |   |   |   |
+-|   |   | @ |   |   |
+-|   |   |   |   |   |
+---+--   -----   -----
+-  #             
+---+--   -----   -----  
+-|   |   |   |   |   |
+-|   +###+<  +###+<  |
+-|   |   |   |   |   |
+------   -----   -----
+-");
++	    fmtmsg("\n"
++"-----   -----   -----\n"
++"|   |   |   |   |   |\n"
++"|   +###+   +###+  >|\n"
++"|   |   |   |   |   |\n"
++"--+--   --+--   --+--\n"
++"  #       #       #\n"
++"--+--   --+--   --+--\n"
++"|   |   |   |   |   |\n"
++"|   |   | @ |   |   |\n"
++"|   |   |   |   |   |\n"
++"--+--   -----   -----\n"
++"  #             \n"
++"--+--   -----   -----  \n"
++"|   |   |   |   |   |\n"
++"|   +###+<  +###+<  |\n"
++"|   |   |   |   |   |\n"
++"-----   -----   -----\n"
++);
+ 	    break;
+ 	case 5:
+-	    fmtmsg("
+-        -----   -----
+-        |   |   |   |
+-        |   +###+<  |
+-        |   |   |   |
+-        -----   --+--
+-                  #
+-        -----   --+--
+-        |   |   |   |
+-        |   +###+   |
+-        |   |   |   |
+-        -----   --+--
+-                  #             
+-                --+--
+-                |   |   
+-                | _ |   
+-                |   |   
+-                -----
+-");
++	    fmtmsg("\n"
++"        -----   -----\n"
++"        |   |   |   |\n"
++"        |   +###+<  |\n"
++"        |   |   |   |\n"
++"        -----   --+--\n"
++"                  #\n"
++"        -----   --+--\n"
++"        |   |   |   |\n"
++"        |   +###+   |\n"
++"        |   |   |   |\n"
++"        -----   --+--\n"
++"                  #             \n"
++"                --+--\n"
++"                |   |   \n"
++"                | _ |   \n"
++"                |   |   \n"
++"                -----\n"
++);
+ 	    break;
+ 	}
+ 	return 1;
+     }
+     else if(typ == 1){
+-	fmtmsg("
+-+###+###+###+   +
+-#   #       #   #
+-#   #       #   #
+-+   +###+   +###+
+-#       #       #
+-#       #       #
+-+###+###+###+   +
+-    #           #
+-    #           #
+-+   +###+###+   <
+-#           #
+-#           #
+-+###+###+###+###<
+-");
++	fmtmsg("\n"
++"+###+###+###+   +\n"
++"#   #       #   #\n"
++"#   #       #   #\n"
++"+   +###+   +###+\n"
++"#       #       #\n"
++"#       #       #\n"
++"+###+###+###+   +\n"
++"    #           #\n"
++"    #           #\n"
++"+   +###+###+   <\n"
++"#           #\n"
++"#           #\n"
++"+###+###+###+###<\n"
++);
+ 	return 1;
+     }
+     else if(typ == 2){
+ 	switch(n){
+ 	case 51:
+-	    fmtmsg("
+-+-+-+-+
+-|     |
+-+     +
+-|     |
+-+     +
+-|     |
+-+-+-< >
+-");
++	    fmtmsg("\n"
++"+-+-+-+\n"
++"|     |\n"
++"+     +\n"
++"|     |\n"
++"+     +\n"
++"|     |\n"
++"+-+-< >\n"
++);
+ 	    break;
+ 	case 52:
+-	    fmtmsg("
+-+-+-+-+
+-|     |
+-+     +
+-|     |
+-+     +
+-|     |
+-+-< >-+
+-");
++	    fmtmsg("\n"
++"+-+-+-+\n"
++"|     |\n"
++"+     +\n"
++"|     |\n"
++"+     +\n"
++"|     |\n"
++"+-< >-+\n"
++);
+ 	    break;
+ 	case 53:
+-	    fmtmsg("
+-+-+-+-+
+-|     |
+-+     +
+-|     |
+-+     +
+-|     |
+-< >-+-+
+-");
++	    fmtmsg("\n"
++"+-+-+-+\n"
++"|     |\n"
++"+     +\n"
++"|     |\n"
++"+     +\n"
++"|     |\n"
++"< >-+-+\n"
++);
+ 	    break;
+ 	case 55:
+-	    fmtmsg("
+-<------
+-      |
+------ |
+-|   | |
+-| >-- |
+-|     |
+--------
+-");
++	    fmtmsg("\n"
++"<------\n"
++"      |\n"
++"----- |\n"
++"|   | |\n"
++"| >-- |\n"
++"|     |\n"
++"-------\n"
++);
+ 	    break;
+ 	case 56:
+-	    fmtmsg("
+->------
+-      |
+------ |
+-|   | |
+-| <-- |
+-|     |
+--------
+-");
++	    fmtmsg("\n"
++">------\n"
++"      |\n"
++"----- |\n"
++"|   | |\n"
++"| <-- |\n"
++"|     |\n"
++"-------\n"
++);
+ 	    break;
+ 	case 57:
+-	    fmtmsg("
+--------
+-|     |
+------ |
+-    | |
+-< >-- |
+-|     |
+--------
+-");
++	    fmtmsg("\n"
++"-------\n"
++"|     |\n"
++"----- |\n"
++"    | |\n"
++"< >-- |\n"
++"|     |\n"
++"-------\n"
++);
+ 	    break;
+ 	case 58:
+-	    fmtmsg("
+-  + +-+
+-  |   |
+->-+ +-< 
+-  |   |
+-  + +-+
+-");
++	    fmtmsg("\n"
++"  + +-+\n"
++"  |   |\n"
++">-+ +-< \n"
++"  |   |\n"
++"  + +-+\n"
++);
+ 	    break;
+ 	}
+     }
diff --git a/games/minami/patches/patch-ae b/games/minami/patches/patch-ae
new file mode 100644
index 00000000000..95eeb08d9ba
--- /dev/null
+++ b/games/minami/patches/patch-ae
@@ -0,0 +1,21 @@
+$NetBSD: patch-ae,v 1.3 2004/01/19 08:45:48 agc Exp $
+
+--- battle.c	2004/01/19 08:35:45	1.1
++++ battle.c	2004/01/19 08:36:20
+@@ -86,11 +86,11 @@
+     *flag = 0;
+ /*    hpbar(n, mons);*/
+ 
+-    fmtmsg("\n[あなたの攻撃]
+-1. こうげき     2.まほう
+-3. アイテム     4.まもる
+-5. にげる
+-");
++    fmtmsg("\n[あなたの攻撃]\n"
++"1. こうげき     2.まほう\n"
++"3. アイテム     4.まもる\n"
++"5. にげる\n"
++);
+     c = Select("", 5);
+     c2 = 0;
+     m = &mons[0];