[Scummvm-git-logs] scummvm master -> 42d8a82c437ef041dd436768ffc058fe6b8e1894
Templier
Templier at users.noreply.github.com
Sat Sep 24 05:05:27 CEST 2016
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:
71766fcc65 LASTEXPRESS: Rename Tatiana functions
45025d53e0 LASTEXPRESS: Rename Vesna functions
c443b84dae LASTEXPRESS: Rename Vassili functions
e34960f633 CREATE_PROJECT: Add SCUMM_64BITS to ScummVM_Global64.props (fixes #9566)
42d8a82c43 CREATE_PROJECT: Do not copy into non-existent msvc8 dist folder
Commit: 71766fcc65523395a3d40a6e6ae82e96ef699e9c
https://github.com/scummvm/scummvm/commit/71766fcc65523395a3d40a6e6ae82e96ef699e9c
Author: Littleboy (littleboy at scummvm.org)
Date: 2016-09-23T22:19:00-04:00
Commit Message:
LASTEXPRESS: Rename Tatiana functions
Changed paths:
engines/lastexpress/entities/kronos.cpp
engines/lastexpress/entities/tatiana.cpp
engines/lastexpress/entities/tatiana.h
diff --git a/engines/lastexpress/entities/kronos.cpp b/engines/lastexpress/entities/kronos.cpp
index 1fe478f..61c1641 100644
--- a/engines/lastexpress/entities/kronos.cpp
+++ b/engines/lastexpress/entities/kronos.cpp
@@ -463,7 +463,7 @@ IMPLEMENT_FUNCTION(19, Kronos, startConcert)
RESET_ENTITY_STATE(kEntitySophie, Sophie, setup_chaptersHandler);
RESET_ENTITY_STATE(kEntityAugust, August, setup_function50);
RESET_ENTITY_STATE(kEntityAnna, Anna, setup_concert);
- RESET_ENTITY_STATE(kEntityTatiana, Tatiana, setup_function35);
+ RESET_ENTITY_STATE(kEntityTatiana, Tatiana, setup_concert);
setup_duringConcert();
break;
diff --git a/engines/lastexpress/entities/tatiana.cpp b/engines/lastexpress/entities/tatiana.cpp
index 951e89d..f684f37 100644
--- a/engines/lastexpress/entities/tatiana.cpp
+++ b/engines/lastexpress/entities/tatiana.cpp
@@ -54,47 +54,47 @@ Tatiana::Tatiana(LastExpressEngine *engine) : Entity(engine, kEntityTatiana) {
ADD_CALLBACK_FUNCTION(Tatiana, callbackActionRestaurantOrSalon);
ADD_CALLBACK_FUNCTION(Tatiana, savegame);
ADD_CALLBACK_FUNCTION(Tatiana, updateEntity);
- ADD_CALLBACK_FUNCTION(Tatiana, function14);
- ADD_CALLBACK_FUNCTION(Tatiana, function15);
- ADD_CALLBACK_FUNCTION(Tatiana, function16);
+ ADD_CALLBACK_FUNCTION(Tatiana, enterCompartment);
+ ADD_CALLBACK_FUNCTION(Tatiana, exitCompartment);
+ ADD_CALLBACK_FUNCTION(Tatiana, handleCompartment);
ADD_CALLBACK_FUNCTION(Tatiana, chapter1);
ADD_CALLBACK_FUNCTION(Tatiana, function18);
ADD_CALLBACK_FUNCTION(Tatiana, chapter1Handler);
- ADD_CALLBACK_FUNCTION(Tatiana, function20);
- ADD_CALLBACK_FUNCTION(Tatiana, function21);
- ADD_CALLBACK_FUNCTION(Tatiana, function22);
- ADD_CALLBACK_FUNCTION(Tatiana, function23);
+ ADD_CALLBACK_FUNCTION(Tatiana, exitDining);
+ ADD_CALLBACK_FUNCTION(Tatiana, returnToCompartment);
+ ADD_CALLBACK_FUNCTION(Tatiana, getSomeAir);
+ ADD_CALLBACK_FUNCTION(Tatiana, returnToCompartmentAgain);
ADD_CALLBACK_FUNCTION(Tatiana, function24);
ADD_CALLBACK_FUNCTION(Tatiana, chapter2);
ADD_CALLBACK_FUNCTION(Tatiana, chapter2Handler);
- ADD_CALLBACK_FUNCTION(Tatiana, function27);
- ADD_CALLBACK_FUNCTION(Tatiana, function28);
- ADD_CALLBACK_FUNCTION(Tatiana, function29);
- ADD_CALLBACK_FUNCTION(Tatiana, function30);
+ ADD_CALLBACK_FUNCTION(Tatiana, breakfastClick);
+ ADD_CALLBACK_FUNCTION(Tatiana, joinAlexei);
+ ADD_CALLBACK_FUNCTION(Tatiana, leaveBreakfast);
+ ADD_CALLBACK_FUNCTION(Tatiana, returnToCompartment2);
ADD_CALLBACK_FUNCTION(Tatiana, chapter3);
- ADD_CALLBACK_FUNCTION(Tatiana, chapter3Handler);
- ADD_CALLBACK_FUNCTION(Tatiana, function33);
- ADD_CALLBACK_FUNCTION(Tatiana, function34);
- ADD_CALLBACK_FUNCTION(Tatiana, function35);
- ADD_CALLBACK_FUNCTION(Tatiana, function36);
- ADD_CALLBACK_FUNCTION(Tatiana, function37);
- ADD_CALLBACK_FUNCTION(Tatiana, function38);
+ ADD_CALLBACK_FUNCTION(Tatiana, playChess);
+ ADD_CALLBACK_FUNCTION(Tatiana, returnToCompartment3);
+ ADD_CALLBACK_FUNCTION(Tatiana, beforeConcert);
+ ADD_CALLBACK_FUNCTION(Tatiana, concert);
+ ADD_CALLBACK_FUNCTION(Tatiana, leaveConcert);
+ ADD_CALLBACK_FUNCTION(Tatiana, afterConcert);
+ ADD_CALLBACK_FUNCTION(Tatiana, cryAnna);
ADD_CALLBACK_FUNCTION(Tatiana, function39);
ADD_CALLBACK_FUNCTION(Tatiana, function40);
- ADD_CALLBACK_FUNCTION(Tatiana, function41);
+ ADD_CALLBACK_FUNCTION(Tatiana, trapCath);
ADD_CALLBACK_FUNCTION(Tatiana, function42);
ADD_CALLBACK_FUNCTION(Tatiana, chapter4);
- ADD_CALLBACK_FUNCTION(Tatiana, chapter4Handler);
- ADD_CALLBACK_FUNCTION(Tatiana, function45);
- ADD_CALLBACK_FUNCTION(Tatiana, function46);
- ADD_CALLBACK_FUNCTION(Tatiana, function47);
- ADD_CALLBACK_FUNCTION(Tatiana, function48);
+ ADD_CALLBACK_FUNCTION(Tatiana, inCompartment4);
+ ADD_CALLBACK_FUNCTION(Tatiana, meetAlexei);
+ ADD_CALLBACK_FUNCTION(Tatiana, withAlexei);
+ ADD_CALLBACK_FUNCTION(Tatiana, thinking);
+ ADD_CALLBACK_FUNCTION(Tatiana, seekCath);
ADD_CALLBACK_FUNCTION(Tatiana, function49);
- ADD_CALLBACK_FUNCTION(Tatiana, function50);
+ ADD_CALLBACK_FUNCTION(Tatiana, alexeiDead);
ADD_CALLBACK_FUNCTION(Tatiana, function51);
ADD_CALLBACK_FUNCTION(Tatiana, chapter5);
ADD_CALLBACK_FUNCTION(Tatiana, chapter5Handler);
- ADD_CALLBACK_FUNCTION(Tatiana, function54);
+ ADD_CALLBACK_FUNCTION(Tatiana, autistic);
ADD_CALLBACK_FUNCTION(Tatiana, function55);
}
@@ -173,7 +173,7 @@ IMPLEMENT_FUNCTION_II(13, Tatiana, updateEntity, CarIndex, EntityPosition)
IMPLEMENT_FUNCTION_END
//////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(14, Tatiana, function14)
+IMPLEMENT_FUNCTION(14, Tatiana, enterCompartment)
switch (savepoint.action) {
default:
break;
@@ -202,7 +202,7 @@ IMPLEMENT_FUNCTION(14, Tatiana, function14)
IMPLEMENT_FUNCTION_END
//////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(15, Tatiana, function15)
+IMPLEMENT_FUNCTION(15, Tatiana, exitCompartment)
switch (savepoint.action) {
default:
break;
@@ -232,7 +232,7 @@ IMPLEMENT_FUNCTION(15, Tatiana, function15)
IMPLEMENT_FUNCTION_END
//////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION_I(16, Tatiana, function16, uint32)
+IMPLEMENT_FUNCTION_I(16, Tatiana, handleCompartment, uint32)
switch (savepoint.action) {
default:
break;
@@ -474,13 +474,13 @@ label_tatiana_chapter1_2:
break;
case kAction124973510:
- setup_function20();
+ setup_exitDining();
break;
}
IMPLEMENT_FUNCTION_END
//////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(20, Tatiana, function20)
+IMPLEMENT_FUNCTION(20, Tatiana, exitDining)
switch (savepoint.action) {
default:
break;
@@ -515,7 +515,7 @@ IMPLEMENT_FUNCTION(20, Tatiana, function20)
case 3:
getSavePoints()->push(kEntityTatiana, kEntityAugust, kAction268620864);
- setup_function21();
+ setup_returnToCompartment();
break;
}
break;
@@ -523,7 +523,7 @@ IMPLEMENT_FUNCTION(20, Tatiana, function20)
IMPLEMENT_FUNCTION_END
//////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(21, Tatiana, function21)
+IMPLEMENT_FUNCTION(21, Tatiana, returnToCompartment)
switch (savepoint.action) {
default:
break;
@@ -586,18 +586,18 @@ IMPLEMENT_FUNCTION(21, Tatiana, function21)
getSavePoints()->push(kEntityTatiana, kEntityVassili, kAction168459827);
setCallback(5);
- setup_function16(kTime1156500);
+ setup_handleCompartment(kTime1156500);
break;
case 5:
case 6:
if (getProgress().field_14 == 29) {
setCallback(6);
- setup_function16((uint)getState()->time + 900);
+ setup_handleCompartment((uint)getState()->time + 900);
} else {
getObjects()->update(kObject49, kEntityPlayer, kObjectLocation1, kCursorHandKnock, kCursorHand);
- setup_function22();
+ setup_getSomeAir();
}
break;
}
@@ -606,7 +606,7 @@ IMPLEMENT_FUNCTION(21, Tatiana, function21)
IMPLEMENT_FUNCTION_END
//////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(22, Tatiana, function22)
+IMPLEMENT_FUNCTION(22, Tatiana, getSomeAir)
switch (savepoint.action) {
default:
break;
@@ -642,7 +642,7 @@ label_update:
getData()->inventoryItem = kItemNone;
- setup_function23();
+ setup_returnToCompartmentAgain();
break;
case kAction1:
@@ -661,7 +661,7 @@ label_update:
getSavePoints()->push(kEntityTatiana, kEntityVassili, kAction122732000);
setCallback(1);
- setup_function15();
+ setup_exitCompartment();
break;
case kActionCallback:
@@ -707,7 +707,7 @@ label_update:
IMPLEMENT_FUNCTION_END
//////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(23, Tatiana, function23)
+IMPLEMENT_FUNCTION(23, Tatiana, returnToCompartmentAgain)
switch (savepoint.action) {
default:
break;
@@ -724,7 +724,7 @@ IMPLEMENT_FUNCTION(23, Tatiana, function23)
case 1:
setCallback(2);
- setup_function14();
+ setup_enterCompartment();
break;
case 2:
@@ -790,13 +790,13 @@ IMPLEMENT_FUNCTION(26, Tatiana, chapter2Handler)
case kActionNone:
if (getState()->time > kTime1800000 && params->param1 && getEntities()->isSomebodyInsideRestaurantOrSalon()) {
getData()->inventoryItem = kItemNone;
- setup_function28();
+ setup_joinAlexei();
}
break;
case kAction1:
getData()->inventoryItem = kItemNone;
- setup_function28();
+ setup_joinAlexei();
break;
case kActionDefault:
@@ -808,7 +808,7 @@ IMPLEMENT_FUNCTION(26, Tatiana, chapter2Handler)
case kActionDrawScene:
if (getEntities()->isPlayerPosition(kCarRestaurant, 64) || getEntities()->isPlayerPosition(kCarRestaurant, 65)) {
getData()->inventoryItem = kItemNone;
- setup_function27();
+ setup_breakfastClick();
}
break;
@@ -819,7 +819,7 @@ IMPLEMENT_FUNCTION(26, Tatiana, chapter2Handler)
IMPLEMENT_FUNCTION_END
//////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(27, Tatiana, function27)
+IMPLEMENT_FUNCTION(27, Tatiana, breakfastClick)
switch (savepoint.action) {
default:
break;
@@ -839,7 +839,7 @@ IMPLEMENT_FUNCTION(27, Tatiana, function27)
getAction()->playAnimation(kEventTatianaBreakfastAlexei);
getInventory()->addItem(kItemParchemin);
getInventory()->setLocationAndProcess(kItem11, kObjectLocation1);
- setup_function28();
+ setup_joinAlexei();
break;
case 2:
@@ -851,7 +851,7 @@ IMPLEMENT_FUNCTION(27, Tatiana, function27)
} else {
getAction()->playAnimation(kEventTatianaAlexei);
}
- setup_function28();
+ setup_joinAlexei();
break;
}
break;
@@ -859,7 +859,7 @@ IMPLEMENT_FUNCTION(27, Tatiana, function27)
IMPLEMENT_FUNCTION_END
//////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(28, Tatiana, function28)
+IMPLEMENT_FUNCTION(28, Tatiana, joinAlexei)
switch (savepoint.action) {
default:
break;
@@ -874,7 +874,7 @@ IMPLEMENT_FUNCTION(28, Tatiana, function28)
case kActionCallback:
if (getCallback() == 1)
- setup_function29();
+ setup_leaveBreakfast();
break;
case kAction123857088:
@@ -892,7 +892,7 @@ IMPLEMENT_FUNCTION(28, Tatiana, function28)
IMPLEMENT_FUNCTION_END
//////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(29, Tatiana, function29)
+IMPLEMENT_FUNCTION(29, Tatiana, leaveBreakfast)
switch (savepoint.action) {
default:
break;
@@ -928,7 +928,7 @@ IMPLEMENT_FUNCTION(29, Tatiana, function29)
break;
case 3:
- setup_function30();
+ setup_returnToCompartment2();
break;
}
break;
@@ -936,7 +936,7 @@ IMPLEMENT_FUNCTION(29, Tatiana, function29)
IMPLEMENT_FUNCTION_END
//////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(30, Tatiana, function30)
+IMPLEMENT_FUNCTION(30, Tatiana, returnToCompartment2)
switch (savepoint.action) {
default:
break;
@@ -953,12 +953,12 @@ IMPLEMENT_FUNCTION(30, Tatiana, function30)
case 1:
setCallback(2);
- setup_function14();
+ setup_enterCompartment();
break;
case 2:
setCallback(3);
- setup_function16(kTimeEnd);
+ setup_handleCompartment(kTimeEnd);
break;
}
break;
@@ -972,7 +972,7 @@ IMPLEMENT_FUNCTION(31, Tatiana, chapter3)
break;
case kActionNone:
- setup_chapter3Handler();
+ setup_playChess();
break;
case kActionDefault:
@@ -998,7 +998,7 @@ IMPLEMENT_FUNCTION(31, Tatiana, chapter3)
IMPLEMENT_FUNCTION_END
//////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(32, Tatiana, chapter3Handler)
+IMPLEMENT_FUNCTION(32, Tatiana, playChess)
EntityData::EntityParametersI5S *parameters = (EntityData::EntityParametersI5S*)_data->getCurrentParameters();
EntityData::EntityParametersSIII *parameters1 = (EntityData::EntityParametersSIII*)_data->getCurrentParameters(1);
@@ -1097,7 +1097,7 @@ IMPLEMENT_FUNCTION(32, Tatiana, chapter3Handler)
case kActionCallback:
if (getCallback() == 1) {
getSavePoints()->push(kEntityTatiana, kEntityAlexei, kAction122288808);
- setup_function33();
+ setup_returnToCompartment3();
}
break;
@@ -1108,7 +1108,7 @@ IMPLEMENT_FUNCTION(32, Tatiana, chapter3Handler)
IMPLEMENT_FUNCTION_END
//////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(33, Tatiana, function33)
+IMPLEMENT_FUNCTION(33, Tatiana, returnToCompartment3)
switch (savepoint.action) {
default:
break;
@@ -1131,11 +1131,11 @@ IMPLEMENT_FUNCTION(33, Tatiana, function33)
case 2:
setCallback(3);
- setup_function14();
+ setup_enterCompartment();
break;
case 3:
- setup_function34();
+ setup_beforeConcert();
break;
}
break;
@@ -1143,14 +1143,14 @@ IMPLEMENT_FUNCTION(33, Tatiana, function33)
IMPLEMENT_FUNCTION_END
//////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(34, Tatiana, function34)
+IMPLEMENT_FUNCTION(34, Tatiana, beforeConcert)
switch (savepoint.action) {
default:
break;
case kActionDefault:
setCallback(1);
- setup_function16(kTime2097000);
+ setup_handleCompartment(kTime2097000);
break;
case kActionCallback:
@@ -1165,7 +1165,7 @@ IMPLEMENT_FUNCTION(34, Tatiana, function34)
getObjects()->update(kObjectCompartmentB, kEntityPlayer, kObjectLocation1, kCursorHandKnock, kCursorHand);
getObjects()->update(kObject49, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand);
- setup_function15();
+ setup_exitCompartment();
break;
case 2:
@@ -1174,7 +1174,7 @@ IMPLEMENT_FUNCTION(34, Tatiana, function34)
break;
case 3:
- setup_function35();
+ setup_concert();
break;
}
break;
@@ -1182,7 +1182,7 @@ IMPLEMENT_FUNCTION(34, Tatiana, function34)
IMPLEMENT_FUNCTION_END
//////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(35, Tatiana, function35)
+IMPLEMENT_FUNCTION(35, Tatiana, concert)
switch (savepoint.action) {
default:
break;
@@ -1193,14 +1193,14 @@ IMPLEMENT_FUNCTION(35, Tatiana, function35)
&& getEntities()->checkFields19(kEntityPlayer, kCarRedSleeping, kPosition_7850)
&& (getState()->time < kTime2133000 || getProgress().field_40)) {
setCallback(1);
- setup_function41();
+ setup_trapCath();
break;
}
label_callback_1:
if (getState()->time > kTime2133000) {
if (getData()->car >= kCarRedSleeping || (getData()->car == kCarGreenSleeping && getData()->entityPosition > kPosition_5790))
- setup_function36();
+ setup_leaveConcert();
}
break;
@@ -1222,12 +1222,12 @@ label_callback_1:
break;
case kAction191668032:
- setup_function36();
+ setup_leaveConcert();
}
IMPLEMENT_FUNCTION_END
//////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(36, Tatiana, function36)
+IMPLEMENT_FUNCTION(36, Tatiana, leaveConcert)
switch (savepoint.action) {
default:
break;
@@ -1249,7 +1249,7 @@ IMPLEMENT_FUNCTION(36, Tatiana, function36)
case 1:
if (!getEntities()->checkFields19(kEntityPlayer, kCarGreenSleeping, kPosition_7850) || getEntities()->isInsideCompartment(kEntityPlayer, kCarRedSleeping, kPosition_8200)) {
setCallback(2);
- setup_function14();
+ setup_enterCompartment();
break;
}
@@ -1265,7 +1265,7 @@ IMPLEMENT_FUNCTION(36, Tatiana, function36)
break;
case 2:
- setup_function37();
+ setup_afterConcert();
break;
}
break;
@@ -1273,7 +1273,7 @@ IMPLEMENT_FUNCTION(36, Tatiana, function36)
IMPLEMENT_FUNCTION_END
//////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(37, Tatiana, function37)
+IMPLEMENT_FUNCTION(37, Tatiana, afterConcert)
switch (savepoint.action) {
default:
break;
@@ -1287,7 +1287,7 @@ IMPLEMENT_FUNCTION(37, Tatiana, function37)
if (Entity::updateParameterTime(kTime2227500, !getEntities()->isPlayerInCar(kCarRedSleeping), params->param4, 450)) {
getProgress().field_5C = 1;
if (getEntities()->isInsideCompartment(kEntityAnna, kCarRedSleeping, kPosition_4070)) {
- setup_function38();
+ setup_cryAnna();
break;
}
}
@@ -1399,7 +1399,7 @@ IMPLEMENT_FUNCTION(37, Tatiana, function37)
IMPLEMENT_FUNCTION_END
//////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(38, Tatiana, function38)
+IMPLEMENT_FUNCTION(38, Tatiana, cryAnna)
switch (savepoint.action) {
default:
break;
@@ -1556,7 +1556,7 @@ IMPLEMENT_FUNCTION(40, Tatiana, function40)
IMPLEMENT_FUNCTION_END
//////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(41, Tatiana, function41)
+IMPLEMENT_FUNCTION(41, Tatiana, trapCath)
switch (savepoint.action) {
default:
break;
@@ -1637,7 +1637,7 @@ IMPLEMENT_FUNCTION(41, Tatiana, function41)
case 4:
setCallback(5);
- setup_function15();
+ setup_exitCompartment();
break;
case 5:
@@ -1674,7 +1674,7 @@ IMPLEMENT_FUNCTION(43, Tatiana, chapter4)
break;
case kActionNone:
- setup_chapter4Handler();
+ setup_inCompartment4();
break;
case kActionDefault:
@@ -1695,25 +1695,25 @@ IMPLEMENT_FUNCTION(43, Tatiana, chapter4)
IMPLEMENT_FUNCTION_END
//////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(44, Tatiana, chapter4Handler)
+IMPLEMENT_FUNCTION(44, Tatiana, inCompartment4)
switch (savepoint.action) {
default:
break;
case kActionDefault:
setCallback(1);
- setup_function16(kTime2362500);
+ setup_handleCompartment(kTime2362500);
break;
case kActionCallback:
if (getCallback() == 1)
- setup_function45();
+ setup_meetAlexei();
break;
}
IMPLEMENT_FUNCTION_END
//////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(45, Tatiana, function45)
+IMPLEMENT_FUNCTION(45, Tatiana, meetAlexei)
switch (savepoint.action) {
default:
break;
@@ -1745,7 +1745,7 @@ IMPLEMENT_FUNCTION(45, Tatiana, function45)
}
getSavePoints()->push(kEntityTatiana, kEntityAlexei, kAction123712592);
- setup_function46();
+ setup_withAlexei();
break;
}
break;
@@ -1753,7 +1753,7 @@ IMPLEMENT_FUNCTION(45, Tatiana, function45)
IMPLEMENT_FUNCTION_END
//////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(46, Tatiana, function46)
+IMPLEMENT_FUNCTION(46, Tatiana, withAlexei)
// Expose parameters as IIIIIS and ignore the default exposed parameters
EntityData::EntityParametersI5S *parameters = (EntityData::EntityParametersI5S*)_data->getCurrentParameters();
@@ -1803,7 +1803,7 @@ IMPLEMENT_FUNCTION(46, Tatiana, function46)
getSavePoints()->push(kEntityTatiana, kEntityAlexei, kAction123536024);
- setup_function47();
+ setup_thinking();
break;
case kActionEndSound:
@@ -1887,7 +1887,7 @@ IMPLEMENT_FUNCTION(46, Tatiana, function46)
IMPLEMENT_FUNCTION_END
//////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(47, Tatiana, function47)
+IMPLEMENT_FUNCTION(47, Tatiana, thinking)
switch (savepoint.action) {
default:
break;
@@ -1912,16 +1912,16 @@ IMPLEMENT_FUNCTION(47, Tatiana, function47)
getEntities()->clearSequences(kEntityTatiana);
setCallback(3);
- setup_function16(kTime2407500);
+ setup_handleCompartment(kTime2407500);
break;
case 3:
case 4:
if (ENTITY_PARAM(0, 1) && getObjects()->get(kObjectCompartment1).model == kObjectModel1) {
- setup_function48();
+ setup_seekCath();
} else {
setCallback(4);
- setup_function16(900);
+ setup_handleCompartment(900);
}
break;
}
@@ -1930,7 +1930,7 @@ IMPLEMENT_FUNCTION(47, Tatiana, function47)
IMPLEMENT_FUNCTION_END
//////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(48, Tatiana, function48)
+IMPLEMENT_FUNCTION(48, Tatiana, seekCath)
switch (savepoint.action) {
default:
break;
@@ -2069,13 +2069,13 @@ IMPLEMENT_FUNCTION(49, Tatiana, function49)
break;
case kAction169360385:
- setup_function50();
+ setup_alexeiDead();
break;
}
IMPLEMENT_FUNCTION_END
//////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(50, Tatiana, function50)
+IMPLEMENT_FUNCTION(50, Tatiana, alexeiDead)
switch (savepoint.action) {
default:
break;
@@ -2165,11 +2165,11 @@ IMPLEMENT_FUNCTION_END
//////////////////////////////////////////////////////////////////////////
IMPLEMENT_FUNCTION(53, Tatiana, chapter5Handler)
if (savepoint.action == kActionProceedChapter5)
- setup_function54();
+ setup_autistic();
IMPLEMENT_FUNCTION_END
//////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(54, Tatiana, function54)
+IMPLEMENT_FUNCTION(54, Tatiana, autistic)
switch (savepoint.action) {
default:
break;
diff --git a/engines/lastexpress/entities/tatiana.h b/engines/lastexpress/entities/tatiana.h
index ca2b800..ed887a8 100644
--- a/engines/lastexpress/entities/tatiana.h
+++ b/engines/lastexpress/entities/tatiana.h
@@ -129,9 +129,9 @@ public:
*/
DECLARE_FUNCTION_2(updateEntity, CarIndex car, EntityPosition entityPosition)
- DECLARE_FUNCTION(function14)
- DECLARE_FUNCTION(function15)
- DECLARE_FUNCTION_1(function16, uint32)
+ DECLARE_FUNCTION(enterCompartment)
+ DECLARE_FUNCTION(exitCompartment)
+ DECLARE_FUNCTION_1(handleCompartment, uint32)
/**
* Setup Chapter 1
@@ -145,10 +145,10 @@ public:
*/
DECLARE_FUNCTION(chapter1Handler)
- DECLARE_FUNCTION(function20)
- DECLARE_FUNCTION(function21)
- DECLARE_FUNCTION(function22)
- DECLARE_FUNCTION(function23)
+ DECLARE_FUNCTION(exitDining)
+ DECLARE_FUNCTION(returnToCompartment)
+ DECLARE_FUNCTION(getSomeAir)
+ DECLARE_FUNCTION(returnToCompartmentAgain)
DECLARE_FUNCTION(function24)
/**
@@ -161,30 +161,26 @@ public:
*/
DECLARE_FUNCTION(chapter2Handler)
- DECLARE_FUNCTION(function27)
- DECLARE_FUNCTION(function28)
- DECLARE_FUNCTION(function29)
- DECLARE_FUNCTION(function30)
+ DECLARE_FUNCTION(breakfastClick)
+ DECLARE_FUNCTION(joinAlexei)
+ DECLARE_FUNCTION(leaveBreakfast)
+ DECLARE_FUNCTION(returnToCompartment2)
/**
* Setup Chapter 3
*/
DECLARE_FUNCTION(chapter3)
- /**
- * Handle Chapter 3 events
- */
- DECLARE_FUNCTION(chapter3Handler)
-
- DECLARE_FUNCTION(function33)
- DECLARE_FUNCTION(function34)
- DECLARE_FUNCTION(function35)
- DECLARE_FUNCTION(function36)
- DECLARE_FUNCTION(function37)
- DECLARE_FUNCTION(function38)
+ DECLARE_FUNCTION(playChess)
+ DECLARE_FUNCTION(returnToCompartment3)
+ DECLARE_FUNCTION(beforeConcert)
+ DECLARE_FUNCTION(concert)
+ DECLARE_FUNCTION(leaveConcert)
+ DECLARE_FUNCTION(afterConcert)
+ DECLARE_FUNCTION(cryAnna)
DECLARE_FUNCTION(function39)
DECLARE_FUNCTION(function40)
- DECLARE_FUNCTION(function41)
+ DECLARE_FUNCTION(trapCath)
/**
* ???
@@ -199,17 +195,13 @@ public:
*/
DECLARE_FUNCTION(chapter4)
- /**
- * Handle Chapter 4 events
- */
- DECLARE_FUNCTION(chapter4Handler)
-
- DECLARE_FUNCTION(function45)
- DECLARE_FUNCTION(function46)
- DECLARE_FUNCTION(function47)
- DECLARE_FUNCTION(function48)
+ DECLARE_FUNCTION(inCompartment4)
+ DECLARE_FUNCTION(meetAlexei)
+ DECLARE_FUNCTION(withAlexei)
+ DECLARE_FUNCTION(thinking)
+ DECLARE_FUNCTION(seekCath)
DECLARE_FUNCTION(function49)
- DECLARE_FUNCTION(function50)
+ DECLARE_FUNCTION(alexeiDead)
DECLARE_FUNCTION(function51)
/**
@@ -222,7 +214,7 @@ public:
*/
DECLARE_FUNCTION(chapter5Handler)
- DECLARE_FUNCTION(function54)
+ DECLARE_FUNCTION(autistic)
DECLARE_FUNCTION(function55)
};
Commit: 45025d53e0921e86a19eba0397fe338eec890621
https://github.com/scummvm/scummvm/commit/45025d53e0921e86a19eba0397fe338eec890621
Author: Littleboy (littleboy at scummvm.org)
Date: 2016-09-23T22:19:00-04:00
Commit Message:
LASTEXPRESS: Rename Vesna functions
Changed paths:
engines/lastexpress/entities/milos.cpp
engines/lastexpress/entities/vesna.cpp
engines/lastexpress/entities/vesna.h
diff --git a/engines/lastexpress/entities/milos.cpp b/engines/lastexpress/entities/milos.cpp
index 90a397c..65cad07 100644
--- a/engines/lastexpress/entities/milos.cpp
+++ b/engines/lastexpress/entities/milos.cpp
@@ -1352,7 +1352,7 @@ IMPLEMENT_FUNCTION(25, Milos, function25)
break;
}
- RESET_ENTITY_STATE(kEntityVesna, Vesna, setup_chapter3Handler);
+ RESET_ENTITY_STATE(kEntityVesna, Vesna, setup_inCompartment);
getData()->location = kLocationInsideCompartment;
diff --git a/engines/lastexpress/entities/vesna.cpp b/engines/lastexpress/entities/vesna.cpp
index 6e9fb4f..8ab3902 100644
--- a/engines/lastexpress/entities/vesna.cpp
+++ b/engines/lastexpress/entities/vesna.cpp
@@ -47,26 +47,26 @@ Vesna::Vesna(LastExpressEngine *engine) : Entity(engine, kEntityVesna) {
ADD_CALLBACK_FUNCTION(Vesna, callbackActionRestaurantOrSalon);
ADD_CALLBACK_FUNCTION(Vesna, callbackActionOnDirection);
ADD_CALLBACK_FUNCTION(Vesna, savegame);
- ADD_CALLBACK_FUNCTION(Vesna, function11);
+ ADD_CALLBACK_FUNCTION(Vesna, homeAlone);
ADD_CALLBACK_FUNCTION(Vesna, chapter1);
- ADD_CALLBACK_FUNCTION(Vesna, chapter1Handler);
- ADD_CALLBACK_FUNCTION(Vesna, function14);
+ ADD_CALLBACK_FUNCTION(Vesna, withMilos);
+ ADD_CALLBACK_FUNCTION(Vesna, homeTogether);
ADD_CALLBACK_FUNCTION(Vesna, function15);
ADD_CALLBACK_FUNCTION(Vesna, chapter2);
ADD_CALLBACK_FUNCTION(Vesna, chapter2Handler);
- ADD_CALLBACK_FUNCTION(Vesna, function18);
+ ADD_CALLBACK_FUNCTION(Vesna, checkTrain);
ADD_CALLBACK_FUNCTION(Vesna, chapter3);
- ADD_CALLBACK_FUNCTION(Vesna, chapter3Handler);
- ADD_CALLBACK_FUNCTION(Vesna, function21);
- ADD_CALLBACK_FUNCTION(Vesna, function22);
- ADD_CALLBACK_FUNCTION(Vesna, function23);
+ ADD_CALLBACK_FUNCTION(Vesna, inCompartment);
+ ADD_CALLBACK_FUNCTION(Vesna, takeAWalk);
+ ADD_CALLBACK_FUNCTION(Vesna, killAnna);
+ ADD_CALLBACK_FUNCTION(Vesna, killedAnna);
ADD_CALLBACK_FUNCTION(Vesna, chapter4);
- ADD_CALLBACK_FUNCTION(Vesna, function25);
- ADD_CALLBACK_FUNCTION(Vesna, function26);
+ ADD_CALLBACK_FUNCTION(Vesna, exitLocation);
+ ADD_CALLBACK_FUNCTION(Vesna, done);
ADD_CALLBACK_FUNCTION(Vesna, function27);
ADD_CALLBACK_FUNCTION(Vesna, chapter5);
- ADD_CALLBACK_FUNCTION(Vesna, chapter5Handler);
- ADD_CALLBACK_FUNCTION(Vesna, function30);
+ ADD_CALLBACK_FUNCTION(Vesna, guarding);
+ ADD_CALLBACK_FUNCTION(Vesna, climbing);
ADD_NULL_FUNCTION();
}
@@ -152,7 +152,7 @@ IMPLEMENT_FUNCTION_II(10, Vesna, savegame, SavegameType, uint32)
IMPLEMENT_FUNCTION_END
//////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(11, Vesna, function11)
+IMPLEMENT_FUNCTION(11, Vesna, homeAlone)
// Expose parameters as IIIS and ignore the default exposed parameters
EntityData::EntityParametersIIIS *parameters = (EntityData::EntityParametersIIIS*)_data->getCurrentParameters();
@@ -255,7 +255,7 @@ IMPLEMENT_FUNCTION(12, Vesna, chapter1)
break;
case kActionNone:
- Entity::timeCheck(kTimeChapter1, params->param1, WRAP_SETUP_FUNCTION(Vesna, setup_chapter1Handler));
+ Entity::timeCheck(kTimeChapter1, params->param1, WRAP_SETUP_FUNCTION(Vesna, setup_withMilos));
break;
case kActionDefault:
@@ -269,7 +269,7 @@ IMPLEMENT_FUNCTION(12, Vesna, chapter1)
IMPLEMENT_FUNCTION_END
//////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(13, Vesna, chapter1Handler)
+IMPLEMENT_FUNCTION(13, Vesna, withMilos)
switch (savepoint.action) {
default:
break;
@@ -282,7 +282,7 @@ IMPLEMENT_FUNCTION(13, Vesna, chapter1Handler)
case kActionCallback:
if (getCallback() == 1) {
getEntities()->clearSequences(kEntityVesna);
- setup_function14();
+ setup_homeTogether();
}
break;
@@ -294,7 +294,7 @@ IMPLEMENT_FUNCTION(13, Vesna, chapter1Handler)
IMPLEMENT_FUNCTION_END
//////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(14, Vesna, function14)
+IMPLEMENT_FUNCTION(14, Vesna, homeTogether)
switch (savepoint.action) {
default:
break;
@@ -307,7 +307,7 @@ IMPLEMENT_FUNCTION(14, Vesna, function14)
case kAction190412928:
setCallback(1);
- setup_function11();
+ setup_homeAlone();
break;
}
IMPLEMENT_FUNCTION_END
@@ -355,18 +355,18 @@ IMPLEMENT_FUNCTION(17, Vesna, chapter2Handler)
case kAction135024800:
setCallback(2);
- setup_function18();
+ setup_checkTrain();
break;
case kAction137165825:
setCallback(1);
- setup_function11();
+ setup_homeAlone();
break;
}
IMPLEMENT_FUNCTION_END
//////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(18, Vesna, function18)
+IMPLEMENT_FUNCTION(18, Vesna, checkTrain)
switch (savepoint.action) {
default:
break;
@@ -470,7 +470,7 @@ IMPLEMENT_FUNCTION(19, Vesna, chapter3)
break;
case kActionNone:
- setup_chapter3Handler();
+ setup_inCompartment();
break;
case kActionDefault:
@@ -486,7 +486,7 @@ IMPLEMENT_FUNCTION(19, Vesna, chapter3)
IMPLEMENT_FUNCTION_END
//////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(20, Vesna, chapter3Handler)
+IMPLEMENT_FUNCTION(20, Vesna, inCompartment)
EntityData::EntityParametersIIIS *parameters = (EntityData::EntityParametersIIIS*)_data->getCurrentParameters();
switch (savepoint.action) {
@@ -497,7 +497,7 @@ IMPLEMENT_FUNCTION(20, Vesna, chapter3Handler)
if (getProgress().field_54 && parameters->param7 != kTimeInvalid) {
if (getState()->time > kTime2250000) {
parameters->param7 = kTimeInvalid;
- setup_function22();
+ setup_killAnna();
break;
}
@@ -506,7 +506,7 @@ IMPLEMENT_FUNCTION(20, Vesna, chapter3Handler)
if (parameters->param7 < getState()->time) {
parameters->param7 = kTimeInvalid;
- setup_function22();
+ setup_killAnna();
break;
}
}
@@ -603,12 +603,12 @@ IMPLEMENT_FUNCTION(20, Vesna, chapter3Handler)
case kAction137165825:
setCallback(5);
- setup_function11();
+ setup_homeAlone();
break;
case kAction155913424:
setCallback(6);
- setup_function21();
+ setup_takeAWalk();
break;
case kAction203663744:
@@ -618,7 +618,7 @@ IMPLEMENT_FUNCTION(20, Vesna, chapter3Handler)
IMPLEMENT_FUNCTION_END
//////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(21, Vesna, function21)
+IMPLEMENT_FUNCTION(21, Vesna, takeAWalk)
switch (savepoint.action) {
default:
break;
@@ -718,7 +718,7 @@ IMPLEMENT_FUNCTION(21, Vesna, function21)
IMPLEMENT_FUNCTION_END
//////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(22, Vesna, function22)
+IMPLEMENT_FUNCTION(22, Vesna, killAnna)
switch (savepoint.action) {
default:
break;
@@ -805,7 +805,7 @@ IMPLEMENT_FUNCTION(22, Vesna, function22)
getData()->location = kLocationInsideCompartment;
getEntities()->clearSequences(kEntityVesna);
- setup_function23();
+ setup_killedAnna();
break;
}
break;
@@ -818,7 +818,7 @@ IMPLEMENT_FUNCTION(22, Vesna, function22)
IMPLEMENT_FUNCTION_END
//////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(23, Vesna, function23)
+IMPLEMENT_FUNCTION(23, Vesna, killedAnna)
switch (savepoint.action) {
default:
break;
@@ -869,7 +869,7 @@ IMPLEMENT_FUNCTION(24, Vesna, chapter4)
case kActionNone:
setCallback(1);
- setup_function11();
+ setup_homeAlone();
break;
case kActionDefault:
@@ -885,12 +885,12 @@ IMPLEMENT_FUNCTION(24, Vesna, chapter4)
case kActionCallback:
if (getCallback() == 1)
- setup_function25();
+ setup_exitLocation();
}
IMPLEMENT_FUNCTION_END
//////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(25, Vesna, function25)
+IMPLEMENT_FUNCTION(25, Vesna, exitLocation)
switch (savepoint.action) {
default:
break;
@@ -898,7 +898,7 @@ IMPLEMENT_FUNCTION(25, Vesna, function25)
case kActionNone:
if (getState()->time > kTime2428200 && !params->param1) {
params->param1 = 1;
- setup_function26();
+ setup_done();
}
break;
@@ -958,7 +958,7 @@ IMPLEMENT_FUNCTION(25, Vesna, function25)
IMPLEMENT_FUNCTION_END
//////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(26, Vesna, function26)
+IMPLEMENT_FUNCTION(26, Vesna, done)
switch (savepoint.action) {
default:
break;
@@ -1030,7 +1030,7 @@ IMPLEMENT_FUNCTION(28, Vesna, chapter5)
break;
case kActionNone:
- setup_chapter5Handler();
+ setup_guarding();
break;
case kActionDefault:
@@ -1044,7 +1044,7 @@ IMPLEMENT_FUNCTION(28, Vesna, chapter5)
IMPLEMENT_FUNCTION_END
//////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(29, Vesna, chapter5Handler)
+IMPLEMENT_FUNCTION(29, Vesna, guarding)
switch (savepoint.action) {
default:
break;
@@ -1069,13 +1069,13 @@ IMPLEMENT_FUNCTION(29, Vesna, chapter5Handler)
case kAction134427424:
getObjects()->update(kObject64, kEntityPlayer, kObjectLocationNone, kCursorNormal, kCursorForward);
- setup_function30();
+ setup_climbing();
break;
}
IMPLEMENT_FUNCTION_END
//////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(30, Vesna, function30)
+IMPLEMENT_FUNCTION(30, Vesna, climbing)
switch (savepoint.action) {
default:
break;
diff --git a/engines/lastexpress/entities/vesna.h b/engines/lastexpress/entities/vesna.h
index 8d25550..f47943c 100644
--- a/engines/lastexpress/entities/vesna.h
+++ b/engines/lastexpress/entities/vesna.h
@@ -54,7 +54,6 @@ public:
*/
DECLARE_FUNCTION_2(enterExitCompartment, const char *sequence, ObjectIndex compartment)
-
/**
* Draws the entity
*
@@ -103,19 +102,15 @@ public:
*/
DECLARE_FUNCTION_2(savegame, SavegameType savegameType, uint32 param)
- DECLARE_FUNCTION(function11)
+ DECLARE_FUNCTION(homeAlone)
/**
* Setup Chapter 1
*/
DECLARE_FUNCTION(chapter1)
- /**
- * Handle Chapter 1 events
- */
- DECLARE_FUNCTION(chapter1Handler)
-
- DECLARE_FUNCTION(function14)
+ DECLARE_FUNCTION(withMilos)
+ DECLARE_FUNCTION(homeTogether)
DECLARE_FUNCTION(function15)
/**
@@ -128,29 +123,25 @@ public:
*/
DECLARE_FUNCTION(chapter2Handler)
- DECLARE_FUNCTION(function18)
+ DECLARE_FUNCTION(checkTrain)
/**
* Setup Chapter 3
*/
DECLARE_FUNCTION(chapter3)
- /**
- * Handle Chapter 3 events
- */
- DECLARE_FUNCTION(chapter3Handler)
-
- DECLARE_FUNCTION(function21)
- DECLARE_FUNCTION(function22)
- DECLARE_FUNCTION(function23)
+ DECLARE_FUNCTION(inCompartment)
+ DECLARE_FUNCTION(takeAWalk)
+ DECLARE_FUNCTION(killAnna)
+ DECLARE_FUNCTION(killedAnna)
/**
* Setup Chapter 4
*/
DECLARE_FUNCTION(chapter4)
- DECLARE_FUNCTION(function25)
- DECLARE_FUNCTION(function26)
+ DECLARE_FUNCTION(exitLocation)
+ DECLARE_FUNCTION(done)
DECLARE_FUNCTION(function27)
/**
@@ -158,12 +149,8 @@ public:
*/
DECLARE_FUNCTION(chapter5)
- /**
- * Handle Chapter 5 events
- */
- DECLARE_FUNCTION(chapter5Handler)
-
- DECLARE_FUNCTION(function30)
+ DECLARE_FUNCTION(guarding)
+ DECLARE_FUNCTION(climbing)
DECLARE_NULL_FUNCTION()
};
Commit: c443b84daeeb5db5736e1062fdb70a7124d5adaf
https://github.com/scummvm/scummvm/commit/c443b84daeeb5db5736e1062fdb70a7124d5adaf
Author: Littleboy (littleboy at scummvm.org)
Date: 2016-09-23T22:19:01-04:00
Commit Message:
LASTEXPRESS: Rename Vassili functions
Changed paths:
engines/lastexpress/entities/vassili.cpp
engines/lastexpress/entities/vassili.h
diff --git a/engines/lastexpress/entities/vassili.cpp b/engines/lastexpress/entities/vassili.cpp
index 2faaa30..e28ace9 100644
--- a/engines/lastexpress/entities/vassili.cpp
+++ b/engines/lastexpress/entities/vassili.cpp
@@ -46,7 +46,7 @@ Vassili::Vassili(LastExpressEngine *engine) : Entity(engine, kEntityVassili) {
ADD_CALLBACK_FUNCTION(Vassili, savegame);
ADD_CALLBACK_FUNCTION(Vassili, chapter1);
ADD_CALLBACK_FUNCTION(Vassili, chapter1Handler);
- ADD_CALLBACK_FUNCTION(Vassili, function6);
+ ADD_CALLBACK_FUNCTION(Vassili, inBed);
ADD_CALLBACK_FUNCTION(Vassili, function7);
ADD_CALLBACK_FUNCTION(Vassili, function8);
ADD_CALLBACK_FUNCTION(Vassili, function9);
@@ -126,7 +126,7 @@ IMPLEMENT_FUNCTION(5, Vassili, chapter1Handler)
break;
case kAction122732000:
- setup_function6();
+ setup_inBed();
break;
case kAction168459827:
@@ -137,7 +137,7 @@ IMPLEMENT_FUNCTION(5, Vassili, chapter1Handler)
IMPLEMENT_FUNCTION_END
//////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(6, Vassili, function6)
+IMPLEMENT_FUNCTION(6, Vassili, inBed)
switch (savepoint.action) {
default:
break;
diff --git a/engines/lastexpress/entities/vassili.h b/engines/lastexpress/entities/vassili.h
index dfdacf7..e5456ed 100644
--- a/engines/lastexpress/entities/vassili.h
+++ b/engines/lastexpress/entities/vassili.h
@@ -64,7 +64,7 @@ public:
*/
DECLARE_FUNCTION(chapter1Handler)
- DECLARE_FUNCTION(function6)
+ DECLARE_FUNCTION(inBed)
DECLARE_FUNCTION(function7)
DECLARE_FUNCTION(function8)
DECLARE_FUNCTION(function9)
Commit: e34960f633ff771d7d404698019cec57d5a8b507
https://github.com/scummvm/scummvm/commit/e34960f633ff771d7d404698019cec57d5a8b507
Author: Littleboy (littleboy at scummvm.org)
Date: 2016-09-23T22:34:47-04:00
Commit Message:
CREATE_PROJECT: Add SCUMM_64BITS to ScummVM_Global64.props (fixes #9566)
Changed paths:
devtools/create_project/msvc.cpp
diff --git a/devtools/create_project/msvc.cpp b/devtools/create_project/msvc.cpp
index e6b47fe..64f3472 100644
--- a/devtools/create_project/msvc.cpp
+++ b/devtools/create_project/msvc.cpp
@@ -158,6 +158,7 @@ void MSVCProvider::createGlobalProp(const BuildSetup &setup) {
// HACK: This definitely should not be here, but otherwise we would not define SDL_BACKEND for x64.
x64Defines.push_back("WIN32");
x64Defines.push_back("SDL_BACKEND");
+ x64Defines.push_back("SCUMM_64BITS");
outputGlobalPropFile(setup, properties, 64, x64Defines, convertPathToWin(setup.filePrefix), setup.runBuildEvents);
}
Commit: 42d8a82c437ef041dd436768ffc058fe6b8e1894
https://github.com/scummvm/scummvm/commit/42d8a82c437ef041dd436768ffc058fe6b8e1894
Author: Littleboy (littleboy at scummvm.org)
Date: 2016-09-23T22:38:17-04:00
Commit Message:
CREATE_PROJECT: Do not copy into non-existent msvc8 dist folder
Changed paths:
devtools/create_project/msvc14/create_project.vcxproj
diff --git a/devtools/create_project/msvc14/create_project.vcxproj b/devtools/create_project/msvc14/create_project.vcxproj
index 839c834..53246d0 100644
--- a/devtools/create_project/msvc14/create_project.vcxproj
+++ b/devtools/create_project/msvc14/create_project.vcxproj
@@ -119,7 +119,6 @@ xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc12\"
xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc11\"
xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc10\"
xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc9\"
-xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc8\"
xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\codeblocks\"
xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\"</Command>
</PostBuildEvent>
@@ -149,7 +148,6 @@ xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc12\"
xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc11\"
xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc10\"
xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc9\"
-xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc8\"
xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\codeblocks\"
xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\"</Command>
</PostBuildEvent>
More information about the Scummvm-git-logs
mailing list