[Scummvm-git-logs] scummvm master -> 8691c4afdf8c1510ee7c10948050e19d0521fa35

dreammaster dreammaster at scummvm.org
Sat Jan 21 22:59:41 CET 2017


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
8691c4afdf TITANIC: Remove a bunch of CParrot unused fields


Commit: 8691c4afdf8c1510ee7c10948050e19d0521fa35
    https://github.com/scummvm/scummvm/commit/8691c4afdf8c1510ee7c10948050e19d0521fa35
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-01-21T16:59:34-05:00

Commit Message:
TITANIC: Remove a bunch of CParrot unused fields

Changed paths:
    engines/titanic/npcs/parrot.cpp
    engines/titanic/npcs/parrot.h


diff --git a/engines/titanic/npcs/parrot.cpp b/engines/titanic/npcs/parrot.cpp
index a377e8a..bf257c0 100644
--- a/engines/titanic/npcs/parrot.cpp
+++ b/engines/titanic/npcs/parrot.cpp
@@ -62,52 +62,6 @@ CParrot::CParrot() : CTrueTalkNPC() {
 	_field12C = 0;
 	_field130 = 0;
 	_panTarget = nullptr;
-	_field138 = 851;
-	_field13C = 851;
-	_field140 = 265;
-	_field144 = 274;
-	_field148 = 726;
-	_field14C = 730;
-	_field150 = 510;
-	_field154 = 570;
-	_field158 = 569;
-	_field15C = 689;
-	_field160 = 690;
-	_field164 = 725;
-	_field168 = 375;
-	_field16C = 508;
-	_field170 = 363;
-	_field174 = 375;
-	_field178 = 303;
-	_field17C = 313;
-	_field180 = 279;
-	_field184 = 302;
-	_field188 = 260;
-	_field18C = 264;
-	_field190 = 315;
-	_field194 = 327;
-	_field198 = 330;
-	_field19C = 360;
-	_field1A0 = 175;
-	_field1A4 = 259;
-	_field1A8 = 175;
-	_field1AC = 175;
-	_field1B0 = 162;
-	_field1B4 = 175;
-	_field1B8 = 150;
-	_field1BC = 162;
-	_field1C0 = 135;
-	_field1C4 = 150;
-	_field1C8 = 95;
-	_field1CC = 135;
-	_field1D0 = 76;
-	_field1D4 = 95;
-	_field1D8 = 55;
-	_field1DC = 76;
-	_field1E0 = 30;
-	_field1E4 = 55;
-	_field1E8 = 0;
-	_field1EC = 30;
 
 	_assetName = "z454.dlg";
 	_assetNumber = 0x13880;
diff --git a/engines/titanic/npcs/parrot.h b/engines/titanic/npcs/parrot.h
index 37b2719..8568e27 100644
--- a/engines/titanic/npcs/parrot.h
+++ b/engines/titanic/npcs/parrot.h
@@ -68,52 +68,6 @@ private:
 	int _field12C;
 	int _field130;
 	CMovePlayerTo *_panTarget;
-	int _field138;
-	int _field13C;
-	int _field140;
-	int _field144;
-	int _field148;
-	int _field14C;
-	int _field150;
-	int _field154;
-	int _field158;
-	int _field15C;
-	int _field160;
-	int _field164;
-	int _field168;
-	int _field16C;
-	int _field170;
-	int _field174;
-	int _field178;
-	int _field17C;
-	int _field180;
-	int _field184;
-	int _field188;
-	int _field18C;
-	int _field190;
-	int _field194;
-	int _field198;
-	int _field19C;
-	int _field1A0;
-	int _field1A4;
-	int _field1A8;
-	int _field1AC;
-	int _field1B0;
-	int _field1B4;
-	int _field1B8;
-	int _field1BC;
-	int _field1C0;
-	int _field1C4;
-	int _field1C8;
-	int _field1CC;
-	int _field1D0;
-	int _field1D4;
-	int _field1D8;
-	int _field1DC;
-	int _field1E0;
-	int _field1E4;
-	int _field1E8;
-	int _field1EC;
 public:
 	CLASSDEF;
 	CParrot();





More information about the Scummvm-git-logs mailing list