diff scn2k/scn2k_cmd.cc @ 29:d229cce98f50

* no more (or, at least, less) duplicate code between scn2kdump and the rest
author thib
date Fri, 06 Mar 2009 20:02:26 +0000
parents d1bb7b365816
children 01aa5ddf7dc8
line wrap: on
line diff
--- a/scn2k/scn2k_cmd.cc
+++ b/scn2k/scn2k_cmd.cc
@@ -938,7 +938,7 @@ int Cmd::GetArgs(const char*& d) {
 	int i; for (i=0; i<100 ; i++) {
 		/* number, variable, string の種別なく値を得る */
 		if (*d == 0x61) { // よくわからない(智代アフター)
-			dprintf("*%d*",d[1]);
+			dprintf("@%d",d[1]);
 			d += 2;
 			if (*d == 0x28) {
 				dprintf("{");
@@ -1237,7 +1237,7 @@ void Cmd::GetCmd(Flags& flags_orig, cons
 		d += 8;
 		/* verbose */
 			// dprintf(" 0x23 - cmd %02x-%02x:%04x:%02x[%2d] \n",cmd1,cmd2,cmd3,cmd4,argc);
-			sprintf(cmdstr, "%02x-%02x:%04x:%02x",cmd1,cmd2,cmd3,cmd4);
+			sprintf(cmdstr, "%02x-%02x:%04x:%02x  : %s",cmd1,cmd2,cmd3,cmd4, CmdDescr(cmd1,cmd2,cmd3,cmd4));
 		/* 引数を得る */
 		/* 特殊引数のもの */
 		int is_special = 0;
@@ -1295,7 +1295,7 @@ void Cmd::GetCmd(Flags& flags_orig, cons
 retry:
 		/* 一般引数のもの */
 		if (!is_special) {
-			dprintf(" 0x23 - cmd %02x-%02x:%04x:%02x[%2d] \n",cmd1,cmd2,cmd3,cmd4,argc);
+			dprintf(" 0x23 - cmd %02x-%02x:%04x:%02x[%2d]  : %s\n",cmd1,cmd2,cmd3,cmd4,argc,CmdDescr(cmd1,cmd2,cmd3,cmd4));
 			dprintf("\t");
 			if (cmd1 == 1 && cmd2 == 0x22 && (cmd3 == 0xc1c || cmd3 == 0x835)) GetArgsSpecial(3, d);
 			else if (cmd1 == 1 && cmd2 == 0x0b && cmd3 == 0x65) GetArgsSpecial(0, d);