thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor clean up, HE games should always copy strings directly.

Browse source 
svn-id: r17838
This commit is contained in:
Travis Howell 2005-04-27 14:26:52 +00:00
parent f6971f847c
commit f5189c323b
5 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scumm/intern.h
View file

@ -836,7 +836,7 @@ protected:
/* HE version 72 script opcodes */
void o72_pushDWord();
void o72_addMessageToStack();
void o72_getScriptString();
void o72_isAnyOf();
void o72_resetCutscene();
void o72_findObjectWithClassOf();

4
scumm/script_v100he.cpp
View file

@ -159,7 +159,7 @@ void ScummEngine_v100he::setupOpcodes() {
/* 5C */
OPCODE(o6_pushByte),
OPCODE(o72_pushDWord),
OPCODE(o72_addMessageToStack),
OPCODE(o72_getScriptString),
OPCODE(o6_pushWord),
/* 60 */
OPCODE(o6_pushWordVar),
@ -487,7 +487,7 @@ void ScummEngine_v100he::o100_actorOps() {
int slot = pop();
int len = resStrLen(string) + 1;
addMessageToStack(string, a->_heTalkQueue[slot].sentence, len);
memcpy(a->_heTalkQueue[slot].sentence, string, len);
a->_heTalkQueue[slot].posX = a->_talkPosX;
a->_heTalkQueue[slot].posY = a->_talkPosY;

12
scumm/script_v72he.cpp
View file

@ -49,7 +49,7 @@ void ScummEngine_v72he::setupOpcodes() {
OPCODE(o72_pushDWord),
OPCODE(o6_pushWordVar),
/* 04 */
OPCODE(o72_addMessageToStack),
OPCODE(o72_getScriptString),
OPCODE(o6_invalid),
OPCODE(o6_invalid),
OPCODE(o6_wordArrayRead),
@ -610,9 +610,9 @@ void ScummEngine_v72he::decodeScriptString(byte *dst, bool scriptString) {
// Get string
if (scriptString) {
addMessageToStack(_scriptPointer, string, sizeof(string));
len = resStrLen(_scriptPointer);
_scriptPointer += len + 1;
len = resStrLen(_scriptPointer) + 1;
memcpy(string, _scriptPointer, len);
_scriptPointer += len;
} else {
copyScriptString(string, sizeof(string));
len = resStrLen(string) + 1;
@ -776,7 +776,7 @@ void ScummEngine_v72he::o72_pushDWord() {
push(a);
}
void ScummEngine_v72he::o72_addMessageToStack() {
void ScummEngine_v72he::o72_getScriptString() {
byte chr;
while ((chr = fetchScriptByte()) != 0) {
@ -1305,7 +1305,7 @@ void ScummEngine_v72he::o72_actorOps() {
int slot = pop();
int len = resStrLen(string) + 1;
addMessageToStack(string, a->_heTalkQueue[slot].sentence, len);
memcpy(a->_heTalkQueue[slot].sentence, string, len);
a->_heTalkQueue[slot].posX = a->_talkPosX;
a->_heTalkQueue[slot].posY = a->_talkPosY;

2
scumm/script_v80he.cpp
View file

@ -49,7 +49,7 @@ void ScummEngine_v80he::setupOpcodes() {
OPCODE(o72_pushDWord),
OPCODE(o6_pushWordVar),
/* 04 */
OPCODE(o72_addMessageToStack),
OPCODE(o72_getScriptString),
OPCODE(o6_invalid),
OPCODE(o6_invalid),
OPCODE(o6_wordArrayRead),

2
scumm/script_v90he.cpp
View file

@ -47,7 +47,7 @@ void ScummEngine_v90he::setupOpcodes() {
OPCODE(o72_pushDWord),
OPCODE(o6_pushWordVar),
/* 04 */
OPCODE(o72_addMessageToStack),
OPCODE(o72_getScriptString),
OPCODE(o6_invalid),
OPCODE(o6_invalid),
OPCODE(o6_wordArrayRead),