[Scummvm-git-logs] scummvm master -> 93e0702562081d80d851ddf56a156c667e6f4fd8
sev-
sev at scummvm.org
Thu Apr 30 13:44:32 UTC 2020
This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
26eb6fe809 STARTREK: Fix copy/paste error which led to broken saves
9af58fee9f GLK: JACL: Fix copy/paste errors
e6b73fb53d TITANIC: Added missed commas between string constants
f257ef5af9 GLK: AGT: Added missing comma between string literals
93e0702562 JANITORIAL: Fix code formatting
Commit: 26eb6fe8098017382441cbee7d92ea400e28e6b8
https://github.com/scummvm/scummvm/commit/26eb6fe8098017382441cbee7d92ea400e28e6b8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-04-30T15:28:04+02:00
Commit Message:
STARTREK: Fix copy/paste error which led to broken saves
Changed paths:
engines/startrek/saveload.cpp
diff --git a/engines/startrek/saveload.cpp b/engines/startrek/saveload.cpp
index 126551b111..89d272ccc2 100644
--- a/engines/startrek/saveload.cpp
+++ b/engines/startrek/saveload.cpp
@@ -244,7 +244,7 @@ bool StarTrekEngine::saveOrLoadGameData(Common::SeekableReadStream *in, Common::
Actor *a = &_actorList[i];
ser.syncAsUint16LE(a->spriteDrawn);
ser.syncString(a->animFilename);
- if (a->bitmapFilename.size() < 15) {
+ if (a->animFilename.size() < 15) {
filler = 0;
for (uint j = 0; j < 16 - a->animFilename.size() - 1; ++j)
ser.syncAsByte(filler); // make sure that exactly 16 bytes are synced
Commit: 9af58fee9fa84c18171b6d58daff64ad8b7e7fe9
https://github.com/scummvm/scummvm/commit/9af58fee9fa84c18171b6d58daff64ad8b7e7fe9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-04-30T15:31:37+02:00
Commit Message:
GLK: JACL: Fix copy/paste errors
Changed paths:
engines/glk/jacl/language.h
engines/glk/jacl/loader.cpp
diff --git a/engines/glk/jacl/language.h b/engines/glk/jacl/language.h
index 74d1d4696b..6797b2b024 100644
--- a/engines/glk/jacl/language.h
+++ b/engines/glk/jacl/language.h
@@ -62,7 +62,7 @@ namespace JACL {
#define SCRIPTING_ON "Scripting on.^"
#define SCRIPTING_OFF "Scripting off.^"
#define SCRIPTING_ALREADY_OFF "Scripting already off.^"
-#define SCRIPTING_ALREADY_ON "Scripting already off.^"
+#define SCRIPTING_ALREADY_ON "Scripting already on.^"
#define CANT_WRITE_SCRIPT "Unable to write to script file.^"
#define ERROR_READING_WALKTHRU "Error reading walkthru file.^"
#define BAD_OOPS "You must follow the ~oops~ command with the word you wish to use instead.^"
@@ -410,7 +410,7 @@ namespace JACL {
#define SCRIPTING_ON "Scripting on.^"
#define SCRIPTING_OFF "Scripting off.^"
#define SCRIPTING_ALREADY_OFF "Scripting already off.^"
-#define SCRIPTING_ALREADY_ON "Scripting already off.^"
+#define SCRIPTING_ALREADY_ON "Scripting already on.^"
#define CANT_WRITE_SCRIPT "Unable to write to script file.^"
#define ERROR_READING_WALKTHRU "Error reading walkthru file.^"
#define BAD_OOPS "You must follow the ~oops~ command with the word you wish to use instead.^"
diff --git a/engines/glk/jacl/loader.cpp b/engines/glk/jacl/loader.cpp
index e5ad3d2522..78c2b5ecd2 100644
--- a/engines/glk/jacl/loader.cpp
+++ b/engines/glk/jacl/loader.cpp
@@ -1495,7 +1495,7 @@ void create_language_constants() {
if (cstring_resolve("SCRIPTING_ALREADY_OFF") == NULL)
create_cstring("SCRIPTING_ALREADY_OFF", SCRIPTING_ALREADY_OFF);
if (cstring_resolve("SCRIPTING_ALREADY_ON") == NULL)
- create_cstring("SCRIPTING_ALREADY_OFF", SCRIPTING_ALREADY_OFF);
+ create_cstring("SCRIPTING_ALREADY_ON", SCRIPTING_ALREADY_ON);
if (cstring_resolve("CANT_WRITE_SCRIPT") == NULL)
create_cstring("CANT_WRITE_SCRIPT", CANT_WRITE_SCRIPT);
if (cstring_resolve("ERROR_READING_WALKTHRU") == NULL)
Commit: e6b73fb53d5cd153a22cd262edfc76f4a6028236
https://github.com/scummvm/scummvm/commit/e6b73fb53d5cd153a22cd262edfc76f4a6028236
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-04-30T15:36:02+02:00
Commit Message:
TITANIC: Added missed commas between string constants
Changed paths:
engines/titanic/npcs/liftbot.cpp
engines/titanic/npcs/parrot.cpp
diff --git a/engines/titanic/npcs/liftbot.cpp b/engines/titanic/npcs/liftbot.cpp
index bb554a104f..bb6e1ca93b 100644
--- a/engines/titanic/npcs/liftbot.cpp
+++ b/engines/titanic/npcs/liftbot.cpp
@@ -158,7 +158,7 @@ bool CLiftBot::NPCPlayTalkingAnimationMsg(CNPCPlayTalkingAnimationMsg *msg) {
static const char *const NAMES[] = {
"Groaning", "Groaning 2", "Talking 1", "Talking 2", "Talking 3",
"Happy Talking", "Complaining", "Aggressive", "Explaining",
- "Happy Talking 2", "Happy Talking 3", "Happy Talking 4"
+ "Happy Talking 2", "Happy Talking 3", "Happy Talking 4",
"Confidential", nullptr
};
diff --git a/engines/titanic/npcs/parrot.cpp b/engines/titanic/npcs/parrot.cpp
index e322b81701..39561f53f5 100644
--- a/engines/titanic/npcs/parrot.cpp
+++ b/engines/titanic/npcs/parrot.cpp
@@ -441,7 +441,7 @@ bool CParrot::NPCPlayTalkingAnimationMsg(CNPCPlayTalkingAnimationMsg *msg) {
"Talking5", "Talking6", "Talking7", nullptr
};
- if (!(_npcFlags & (NPCFLAG_MOVING | NPCFLAG_MOVE_START | NPCFLAG_MOVE_LOOP | NPCFLAG_MOVE_FINISH
+ if (!(_npcFlags & (NPCFLAG_MOVING | NPCFLAG_MOVE_START | NPCFLAG_MOVE_LOOP | NPCFLAG_MOVE_FINISH
| NPCFLAG_MOVE_LEFT | NPCFLAG_MOVE_RIGHT | NPCFLAG_MOVE_END))
&& _visible && _state == PARROT_IN_CAGE) {
if (compareViewNameTo("ParrotLobby.Node 1.N"))
@@ -453,11 +453,11 @@ bool CParrot::NPCPlayTalkingAnimationMsg(CNPCPlayTalkingAnimationMsg *msg) {
bool CParrot::NPCPlayIdleAnimationMsg(CNPCPlayIdleAnimationMsg *msg) {
static const char *const NAMES[] = {
- "Idle0", "Idle1", "Peck At Feet", "Peck At Feet Left"
+ "Idle0", "Idle1", "Peck At Feet", "Peck At Feet Left",
"Peck At Feet Right", nullptr
};
- if (!(_npcFlags & (NPCFLAG_MOVING | NPCFLAG_MOVE_START | NPCFLAG_MOVE_LOOP | NPCFLAG_MOVE_FINISH
+ if (!(_npcFlags & (NPCFLAG_MOVING | NPCFLAG_MOVE_START | NPCFLAG_MOVE_LOOP | NPCFLAG_MOVE_FINISH
| NPCFLAG_MOVE_LEFT | NPCFLAG_MOVE_RIGHT | NPCFLAG_MOVE_END))
&& _visible && _state == PARROT_IN_CAGE && compareViewNameTo("ParrotLobby.Node 1.N")) {
CGameObject *dragItem = getDraggingObject();
Commit: f257ef5af9bf626530692e5b2a694b49092e943e
https://github.com/scummvm/scummvm/commit/f257ef5af9bf626530692e5b2a694b49092e943e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-04-30T15:39:42+02:00
Commit Message:
GLK: AGT: Added missing comma between string literals
Changed paths:
engines/glk/agt/runverb.cpp
diff --git a/engines/glk/agt/runverb.cpp b/engines/glk/agt/runverb.cpp
index 203cfdd430..db23c44527 100644
--- a/engines/glk/agt/runverb.cpp
+++ b/engines/glk/agt/runverb.cpp
@@ -298,7 +298,7 @@ static int can_wear(parse_rec *objrec)
{
static const char *errs[] = {
"$The_n$$noun$ $n_is$ far too heavy to wear.",
- "$You're$ already loaded down with too much weight as it is."
+ "$You're$ already loaded down with too much weight as it is.",
"$The_n$$noun$ $n_is$ too big and bulky to wear.",
"$You're$ wearing too much to also wear $the_n$$noun$."
};
Commit: 93e0702562081d80d851ddf56a156c667e6f4fd8
https://github.com/scummvm/scummvm/commit/93e0702562081d80d851ddf56a156c667e6f4fd8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-04-30T15:44:13+02:00
Commit Message:
JANITORIAL: Fix code formatting
Changed paths:
engines/glk/agt/runverb.cpp
diff --git a/engines/glk/agt/runverb.cpp b/engines/glk/agt/runverb.cpp
index db23c44527..b5e1afcc81 100644
--- a/engines/glk/agt/runverb.cpp
+++ b/engines/glk/agt/runverb.cpp
@@ -47,9 +47,8 @@ void v_look() {
}
-static void v_go(int dir)
/* 1=N, etc. */
-{
+static void v_go(int dir) {
int newloc, tmploc;
int i;
/* rbool has_seen;*/
@@ -121,11 +120,8 @@ static void v_go(int dir)
}
-
-
-static void v_noun(int vc, parse_rec *nounrec)
/* PUSH, PULL, TURN, PLAY, CHANGE_LOCATIONS */
-{
+static void v_noun(int vc, parse_rec *nounrec) {
int dobj_;
dobj_ = p_obj(nounrec);
@@ -183,9 +179,8 @@ static void v_noun(int vc, parse_rec *nounrec)
nounrec, NULL);
}
-static void v_talk(int vc, parse_rec *nounrec, parse_rec *objrec)
/* vc==1 if ASK, 0 if TALK TO */
-{
+static void v_talk(int vc, parse_rec *nounrec, parse_rec *objrec) {
int dobj_, iobj_;
dobj_ = p_obj(nounrec);
@@ -293,9 +288,8 @@ static void v_eat(int vc, parse_rec *nounrec) {
}
-static int can_wear(parse_rec *objrec)
/* assumes objrec is in the noun range */
-{
+static int can_wear(parse_rec *objrec) {
static const char *errs[] = {
"$The_n$$noun$ $n_is$ far too heavy to wear.",
"$You're$ already loaded down with too much weight as it is.",
@@ -314,9 +308,8 @@ static int can_wear(parse_rec *objrec)
}
-static int can_carry(parse_rec *objrec)
/* assumes objrec is in the noun range */
-{
+static int can_carry(parse_rec *objrec) {
static const char *errs[] = {
"$The_n$$noun$ $n_is$ far too heavy to carry.",
"$You're$ already carrying too much weight as it is.",
@@ -494,9 +487,8 @@ static void v_wear(parse_rec *objrec) {
it_move(obj, 1000);
}
-static int do_lock(uchar l_or_u, parse_rec *nounrec, parse_rec *objrec)
/* l_or_u: 0=lock, 1=unlock */
-{
+static int do_lock(uchar l_or_u, parse_rec *nounrec, parse_rec *objrec) {
int dnoun;
int dobj_, iobj_;
word dobj_word;
@@ -563,9 +555,8 @@ static int do_lock(uchar l_or_u, parse_rec *nounrec, parse_rec *objrec)
return 1;
}
-static void v_lock(uchar l_or_u, parse_rec *nounrec, parse_rec *objrec)
/* First argument indicates lock or unlock-- 0=lock, 1=unlock */
-{
+static void v_lock(uchar l_or_u, parse_rec *nounrec, parse_rec *objrec) {
if (!do_lock(l_or_u, nounrec, objrec)) return;
/* Need to fix these messages: */
alt_sysmsg((l_or_u ? 112 : 122),
@@ -573,9 +564,8 @@ static void v_lock(uchar l_or_u, parse_rec *nounrec, parse_rec *objrec)
nounrec, objrec);
}
-static void v_open(parse_rec *nounrec, parse_rec *objrec)
/* OPEN ... WITH ... */
-{
+static void v_open(parse_rec *nounrec, parse_rec *objrec) {
int dnoun;
int dobj_, iobj_;
@@ -695,9 +685,8 @@ static void v_turn(word prep_, parse_rec *nounrec) {
-static void v_attack(uchar missile, parse_rec *targrec, parse_rec *weprec)
/* Missile=1 if actually firing a weapon. */
-{
+static void v_attack(uchar missile, parse_rec *targrec, parse_rec *weprec) {
int targ, wep;
targ = targrec->obj;
wep = weprec->obj;
@@ -894,9 +883,8 @@ static rbool v_put(parse_rec *nounrec, word prep_,
}
-static void v_throw(parse_rec *nounrec, word prep_, parse_rec *objrec)
/* at, to, in, into, across, inside */
-{
+static void v_throw(parse_rec *nounrec, word prep_, parse_rec *objrec) {
int dobj_, iobj_;
dobj_ = p_obj(nounrec);
iobj_ = p_obj(objrec);
@@ -1079,10 +1067,9 @@ static int checkgram(int vb_, int dobj_, word prep_, int iobj_, rbool redir_flag
}
-static rbool verify_scope(int vb_, parse_rec *nounrec,
- word prep_, parse_rec *objrec)
/* This checks to make sure that all of the objects are present */
-{
+static rbool verify_scope(int vb_, parse_rec *nounrec,
+ word prep_, parse_rec *objrec) {
int msgnum;
int dobj_, iobj_;
dobj_ = nounrec->obj;
@@ -1196,10 +1183,9 @@ rbool metacommand_cycle(int save_vb, int *p_redir_flag) {
-void exec_verb(void)
/* Execute both meta-commands and more normal commands */
/* May need tweaking for AGAIN and UNDO */
-{
+void exec_verb(void) {
int objswap; /* 1=if iobj has been moved to dobj */
/* (Done for metacommands when there is an iobj but no dobj) */
rbool turndone;
More information about the Scummvm-git-logs
mailing list