[Scummvm-cvs-logs] CVS: scummvm/bs2 speech.cpp,1.18,1.19 speech.h,1.1,1.2
Torbj?rn Andersson
eriktorbjorn at users.sourceforge.net
Sat Sep 20 05:44:01 CEST 2003
Update of /cvsroot/scummvm/scummvm/bs2
In directory sc8-pr-cvs1:/tmp/cvs-serv1767
Modified Files:
speech.cpp speech.h
Log Message:
cleanup
Index: speech.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/speech.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- speech.cpp 17 Sep 2003 21:06:14 -0000 1.18
+++ speech.cpp 20 Sep 2003 12:42:56 -0000 1.19
@@ -17,11 +17,9 @@
* $Header$
*/
-//------------------------------------------------------------------------------------
#include "stdafx.h"
#include "stdafx.h"
-//#include "src\driver96.h"
#include "anims.h"
#include "console.h"
#include "controls.h" // for 'subtitles' & 'speechSelected'
[...3057 lines suppressed...]
case 920: // location 62
case 923: // location 62
case 926: // location 62
-
- {
- return 0; // don't want speech for these lines!
- break;
- }
+ // don't want speech for these lines!
+ return 0;
default:
- return 1; // ok for all other lines
+ // ok for all other lines
+ return 1;
}
}
-//------------------------------------------------------------------------------------
Index: speech.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/speech.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- speech.h 28 Jul 2003 01:44:38 -0000 1.1
+++ speech.h 20 Sep 2003 12:42:56 -0000 1.2
@@ -20,25 +20,26 @@
#ifndef _SPEECH
#define _SPEECH
-//#include "src\driver96.h"
#include "header.h"
+#define MAX_SUBJECT_LIST 30 // is that enough?
-#define MAX_SUBJECT_LIST 30 //is that enough?
+// array of these for subject menu build up
+typedef struct {
+ uint32 res;
+ uint32 ref;
+} _subject_unit;
+// so speech text cleared when running a new start-script
+extern uint32 speech_text_bloc_no;
+extern int16 officialTextNumber;
-typedef struct //array of these for subject menu build up
-{
- uint32 res;
- uint32 ref;
-} _subject_unit;
+extern int32 speechScriptWaiting;
-extern uint32 speech_text_bloc_no; // so speech text cleared when running a new start-script
-extern int16 officialTextNumber;
+//could alternately use logic->looping of course
+extern int choosing;
-extern int32 speechScriptWaiting;
+extern uint32 unpause_zone;
-extern int choosing; //could alternately use logic->looping of course
-extern uint32 unpause_zone;
#endif
More information about the Scummvm-git-logs
mailing list