Devtools: Improve fixtype cmd and document it

diff --git a/Docs/DEVTOOLS.txt b/Docs/DEVTOOLS.txt
index 7312be8d63f4cf148285c71cb568886b0453d1ac..cfb823200ae9a041eafd25c26712bfcea74bf0a1 100644 (file)
--- a/Docs/DEVTOOLS.txt
+++ b/Docs/DEVTOOLS.txt
@@ -234,7 +234,10 @@ fixdialog (int) (string) - replaces the dialog of given index by the one
     described in the "string.txt" file.
 ddialog (int) - deletes given dialog (if no argument or -1, deletes the last
     dialog). Does not work when actually playing a dialog.
+fixtype (int) (int) - fixes the type (2nd arg) of the given dialog (1st arg).
 play (int) - plays given dialog.
+fixrotation - when playing a dialog, sets the in-dialog yaw of the current
+    participant to its out-of-dialog yaw value.
 
 Graphics
 ~~~~~~~~

diff --git a/Source/Devtools/ConsoleCmds.cpp b/Source/Devtools/ConsoleCmds.cpp
index 3ae5e20c149856410f78cd9d6524b6ea5e9d1e1c..63063ed24ec9508a922d34548749d40c43cb9d20 100644 (file)
--- a/Source/Devtools/ConsoleCmds.cpp
+++ b/Source/Devtools/ConsoleCmds.cpp
@@ -598,19 +598,20 @@ void ch_dialog(const char* args)
 void ch_fixdialog(const char* args)
 {
     char buf1[32];
-    int whichdi;
+    int whichdlg = 0;
 
-    sscanf(args, "%d %31s", &whichdi, buf1);
+    sscanf(args, "%d %31s", &whichdlg, buf1);
     std::string filename = std::string("Dialogues/") + buf1 + ".txt";
 
-    Dialog::dialogs[whichdi] = Dialog(Dialog::dialogs[whichdi].type, filename);
+    Dialog::dialogs[whichdlg] = Dialog(Dialog::dialogs[whichdlg].type, filename);
 }
 
 void ch_fixtype(const char* args)
 {
-    int dlg;
-    sscanf(args, "%d", &dlg);
-    Dialog::dialogs[0].type = dlg;
+    int whichdlg = 0;
+    int type = 0;
+    sscanf(args, "%d %d", &whichdlg, &type);
+    Dialog::dialogs[whichdlg].type = type;
 }
 
 void ch_fixrotation(const char*)

diff --git a/Source/Objects/Person.hpp b/Source/Objects/Person.hpp
index 322bdeedb142c3552c4e64f1f6f0d8ac4bb32725..0734eaa5e2e3dd2022fde3f0316e1acdddd9896e 100644 (file)
--- a/Source/Objects/Person.hpp
+++ b/Source/Objects/Person.hpp
@@ -96,11 +96,6 @@ public:
     XYZ coords;
     XYZ velocity;
 
-    //~ XYZ proportionhead;
-    //~ XYZ proportionlegs;
-    //~ XYZ proportionarms;
-    //~ XYZ proportionbody;
-
     float unconscioustime;
 
     bool immobile;