Skip to content

Commit

Permalink
fix misplaced merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@JustinLove
JustinLove committed May 10, 2024
1 parent 1d7c2da commit 78efc20
Show file tree
Hide file tree
Showing 37 changed files with 312 additions and 312 deletions.
20 changes: 10 additions & 10 deletions age-scaling
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/gameSource/LivingLifePage.cpp b/gameSource/LivingLifePage.cpp
index 4742e4206..ab9ecbe05 100644
index 7806437e4..dc864583e 100644
--- a/gameSource/LivingLifePage.cpp
+++ b/gameSource/LivingLifePage.cpp
@@ -1541,7 +1541,7 @@ static double computeCurrentAgeNoOverride( LiveObject *inObj ) {
@@ -1640,7 +1640,7 @@ static double computeCurrentAgeNoOverride( LiveObject *inObj ) {
return inObj->age;
}
else {
Expand All @@ -11,7 +11,7 @@ index 4742e4206..ab9ecbe05 100644
inObj->ageRate * ( game_getCurrentTime() - inObj->lastAgeSetTime );
}
}
@@ -1561,9 +1561,9 @@ double computeCurrentAge( LiveObject *inObj ) {
@@ -1660,9 +1660,9 @@ double computeCurrentAge( LiveObject *inObj ) {
// baby cries for 5 seconds each time they speak

// update age using clock
Expand All @@ -23,7 +23,7 @@ index 4742e4206..ab9ecbe05 100644
}
else {
// temp override over
@@ -1571,7 +1571,8 @@ double computeCurrentAge( LiveObject *inObj ) {
@@ -1670,7 +1670,8 @@ double computeCurrentAge( LiveObject *inObj ) {
}
}

Expand All @@ -33,7 +33,7 @@ index 4742e4206..ab9ecbe05 100644
}

}
@@ -27609,7 +27610,7 @@ void LivingLifePage::pointerDown( float inX, float inY ) {
@@ -27722,7 +27723,7 @@ void LivingLifePage::pointerDown( float inX, float inY ) {

char tryingToPickUpBaby = false;

Expand All @@ -42,7 +42,7 @@ index 4742e4206..ab9ecbe05 100644

if( destID == 0 &&
p.hit &&
@@ -27632,7 +27633,7 @@ void LivingLifePage::pointerDown( float inX, float inY ) {
@@ -27745,7 +27746,7 @@ void LivingLifePage::pointerDown( float inX, float inY ) {
if( distance( targetPos, o->currentPos ) < 1 ) {
// clicked on someone

Expand Down Expand Up @@ -201,15 +201,15 @@ index 328068e08..60314b818 100644
+
+double computeServerAge( double displayAge );
diff --git a/gameSource/musicPlayer2.cpp b/gameSource/musicPlayer2.cpp
index bd9582eba..afec025d7 100644
index 0d7b5344f..08f9443f2 100644
--- a/gameSource/musicPlayer2.cpp
+++ b/gameSource/musicPlayer2.cpp
@@ -1,3 +1,4 @@
+#include "ageControl.h"
#include "minorGems/game/game.h"
#include <math.h>

@@ -72,25 +73,27 @@ void initMusicPlayer() {
@@ -77,25 +78,27 @@ void initMusicPlayer() {

// returns an asynch file read handle, or -1 on failure
static int startNextAgeFileRead( double inAge ) {
Expand Down Expand Up @@ -243,7 +243,7 @@ index bd9582eba..afec025d7 100644

char *searchString = autoSprintf( "_%02d.ogg", nextFiveBlock );

@@ -147,7 +150,7 @@ void restartMusic( double inAge, double inAgeRate, char inForceNow ) {
@@ -154,7 +157,7 @@ void restartMusic( double inAge, double inAgeRate, char inForceNow ) {
musicStarted = false;
forceStartNow = inForceNow;

Expand All @@ -252,7 +252,7 @@ index bd9582eba..afec025d7 100644
ageRate = inAgeRate;

samplesSeenSinceAgeSet = 0;
@@ -172,7 +175,7 @@ void restartMusic( double inAge, double inAgeRate, char inForceNow ) {
@@ -179,7 +182,7 @@ void restartMusic( double inAge, double inAgeRate, char inForceNow ) {
musicOGGPlaying = false;


Expand Down
30 changes: 15 additions & 15 deletions autorun
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/gameSource/LivingLifePage.cpp b/gameSource/LivingLifePage.cpp
index 0d3eb5cd5..edc86e8be 100644
index 01e5bd54a..2a30b95bd 100644
--- a/gameSource/LivingLifePage.cpp
+++ b/gameSource/LivingLifePage.cpp
@@ -140,10 +140,18 @@ static JenkinsRandomSource remapRandSource( 340403 );
Expand All @@ -25,7 +25,7 @@ index 0d3eb5cd5..edc86e8be 100644

static int screenCenterPlayerOffsetX, screenCenterPlayerOffsetY;

@@ -2307,7 +2315,7 @@ void LivingLifePage::computePathToDest( LiveObject *inObject ) {
@@ -2406,7 +2414,7 @@ void LivingLifePage::computePathToDest( LiveObject *inObject ) {
inObject->pathToDest[i].y -= pathOffsetY;
}

Expand All @@ -34,7 +34,7 @@ index 0d3eb5cd5..edc86e8be 100644

// up, down, left, right
int dirsInPath[4] = { 0, 0, 0, 0 };
@@ -2755,6 +2763,14 @@ LivingLifePage::LivingLifePage()
@@ -2854,6 +2862,14 @@ LivingLifePage::LivingLifePage()

// allow ctrl-v to paste into chat from clipboard
mSayField.usePasteShortcut( true );
Expand All @@ -49,7 +49,7 @@ index 0d3eb5cd5..edc86e8be 100644

initLiveTriggers();

@@ -12927,8 +12943,13 @@ void LivingLifePage::step() {
@@ -13028,8 +13044,13 @@ void LivingLifePage::step() {
}


Expand All @@ -63,7 +63,7 @@ index 0d3eb5cd5..edc86e8be 100644
}

double pageLifeTime = game_getCurrentTime() - mPageStartTime;
@@ -22148,10 +22169,41 @@ void LivingLifePage::step() {
@@ -22259,10 +22280,41 @@ void LivingLifePage::step() {
}
}
else {
Expand Down Expand Up @@ -107,7 +107,7 @@ index 0d3eb5cd5..edc86e8be 100644
float worldMouseX, worldMouseY;

screenToWorld( lastScreenMouseX,
@@ -22170,9 +22222,7 @@ void LivingLifePage::step() {
@@ -22281,9 +22333,7 @@ void LivingLifePage::step() {
// however, if they started by clicking on something
// make sure they are really holding the mouse down
// (give them time to unpress the mouse)
Expand All @@ -118,7 +118,7 @@ index 0d3eb5cd5..edc86e8be 100644

double absX = fabs( delta.x );
double absY = fabs( delta.y );
@@ -22184,10 +22234,7 @@ void LivingLifePage::step() {
@@ -22295,10 +22345,7 @@ void LivingLifePage::step() {

if( absX < CELL_D * 4
&&
Expand All @@ -130,7 +130,7 @@ index 0d3eb5cd5..edc86e8be 100644

// they're holding mouse down very close
// to to their character
@@ -22221,20 +22268,24 @@ void LivingLifePage::step() {
@@ -22332,20 +22379,24 @@ void LivingLifePage::step() {
pointerDown( fakeClick.x, fakeClick.y );
isAutoClick = false;

Expand Down Expand Up @@ -159,7 +159,7 @@ index 0d3eb5cd5..edc86e8be 100644

// reached destination of bare-ground click

@@ -22396,6 +22447,20 @@ void LivingLifePage::step() {
@@ -22507,6 +22558,20 @@ void LivingLifePage::step() {
endPos.x = (double)( nextStep.x );
endPos.y = (double)( nextStep.y );
}
Expand All @@ -180,7 +180,7 @@ index 0d3eb5cd5..edc86e8be 100644
}
}
}
@@ -22415,6 +22480,9 @@ void LivingLifePage::step() {
@@ -22526,6 +22591,9 @@ void LivingLifePage::step() {
//trailColor.g = randSource.getRandomBoundedDouble( 0, .5 );
//trailColor.b = randSource.getRandomBoundedDouble( 0, .5 );

Expand All @@ -190,7 +190,7 @@ index 0d3eb5cd5..edc86e8be 100644

if( ( o->id != ourID &&
! o->somePendingMessageIsMoreMovement )
@@ -24241,12 +24309,33 @@ void LivingLifePage::pointerDown( float inX, float inY ) {
@@ -24354,12 +24422,33 @@ void LivingLifePage::pointerDown( float inX, float inY ) {
// something actionable along the way
char mouseAlreadyDown = mouseDown;

Expand Down Expand Up @@ -225,15 +225,15 @@ index 0d3eb5cd5..edc86e8be 100644

if( mFirstServerMessagesReceived != 3 || ! mDoneLoadingFirstObjectSet ) {
return;
@@ -24261,7 +24350,6 @@ void LivingLifePage::pointerDown( float inX, float inY ) {
@@ -24374,7 +24463,6 @@ void LivingLifePage::pointerDown( float inX, float inY ) {
}


- LiveObject *ourLiveObject = getOurLiveObject();

if( ourLiveObject->holdingID > 0 &&
getObject( ourLiveObject->holdingID )->speedMult == 0 ) {
@@ -24499,9 +24587,7 @@ void LivingLifePage::pointerDown( float inX, float inY ) {
@@ -24612,9 +24700,7 @@ void LivingLifePage::pointerDown( float inX, float inY ) {
int mapY = clickDestY - mMapOffsetY + mMapD / 2;


Expand All @@ -244,7 +244,7 @@ index 0d3eb5cd5..edc86e8be 100644

// continuous movement mode

@@ -25924,11 +26010,17 @@ void LivingLifePage::pointerUp( float inX, float inY ) {
@@ -26037,11 +26123,17 @@ void LivingLifePage::pointerUp( float inX, float inY ) {
return;
}

Expand All @@ -267,7 +267,7 @@ index 0d3eb5cd5..edc86e8be 100644

// treat the up as one final click (at closest next path position
// to where they currently are)
@@ -25950,6 +26042,7 @@ void LivingLifePage::pointerUp( float inX, float inY ) {
@@ -26063,6 +26155,7 @@ void LivingLifePage::pointerUp( float inX, float inY ) {
}

mouseDown = false;
Expand Down
24 changes: 12 additions & 12 deletions camera-control
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/gameSource/LivingLifePage.cpp b/gameSource/LivingLifePage.cpp
index 4a55e435e..7cf481f77 100644
index 1f86e900f..f006cc4e9 100644
--- a/gameSource/LivingLifePage.cpp
+++ b/gameSource/LivingLifePage.cpp
@@ -57,6 +57,9 @@
Expand Down Expand Up @@ -27,7 +27,7 @@ index 4a55e435e..7cf481f77 100644

// set to true to render for teaser video
static char teaserVideo = false;
@@ -2860,6 +2871,24 @@ LivingLifePage::LivingLifePage()
@@ -2959,6 +2970,24 @@ LivingLifePage::LivingLifePage()
// allow ctrl-v to paste into chat from clipboard
mSayField.usePasteShortcut( true );

Expand All @@ -52,7 +52,7 @@ index 4a55e435e..7cf481f77 100644
//
// set to 0 to disable double click to run; you can't click twice in 1 frame
maxDoubleClickFrames = SettingsManager::getIntSetting( "maxDoubleClickFrames", 30 );
@@ -16016,6 +16045,43 @@ void LivingLifePage::step() {
@@ -16119,6 +16148,43 @@ void LivingLifePage::step() {
mMapOffsetX = newMapOffsetX;
mMapOffsetY = newMapOffsetY;

Expand Down Expand Up @@ -96,7 +96,7 @@ index 4a55e435e..7cf481f77 100644

unsigned char *compressedChunk =
new unsigned char[ compressedSize ];
@@ -21734,6 +21800,30 @@ void LivingLifePage::step() {
@@ -21845,6 +21911,30 @@ void LivingLifePage::step() {

doublePair screenTargetPos =
mult( targetObjectPos, CELL_D );
Expand Down Expand Up @@ -127,7 +127,7 @@ index 4a55e435e..7cf481f77 100644

if( vogMode ) {
// don't adjust camera
@@ -21746,6 +21836,10 @@ void LivingLifePage::step() {
@@ -21857,6 +21947,10 @@ void LivingLifePage::step() {
// moving

// push camera out in front
Expand All @@ -138,7 +138,7 @@ index 4a55e435e..7cf481f77 100644


double moveScale = 40 * cameraFollowsObject->currentSpeed;
@@ -21777,18 +21871,6 @@ void LivingLifePage::step() {
@@ -21888,18 +21982,6 @@ void LivingLifePage::step() {
lrint( moveScale *
cameraFollowsObject->currentMoveDirection.y );

Expand All @@ -157,7 +157,7 @@ index 4a55e435e..7cf481f77 100644
}
else if( false ) { // skip for now
// stopped moving
@@ -21829,6 +21911,22 @@ void LivingLifePage::step() {
@@ -21940,6 +22022,22 @@ void LivingLifePage::step() {

}

Expand All @@ -180,7 +180,7 @@ index 4a55e435e..7cf481f77 100644
if( ! vogMode ) {

screenTargetPos.x =
@@ -21848,6 +21946,10 @@ void LivingLifePage::step() {
@@ -21959,6 +22057,10 @@ void LivingLifePage::step() {
if( !shouldMoveCamera ) {
screenTargetPos = lastScreenViewCenter;
}
Expand All @@ -191,15 +191,15 @@ index 4a55e435e..7cf481f77 100644


doublePair dir = sub( screenTargetPos, lastScreenViewCenter );
@@ -23210,6 +23312,7 @@ void LivingLifePage::makeActive( char inFresh ) {
@@ -23321,6 +23423,7 @@ void LivingLifePage::makeActive( char inFresh ) {

mouseDown = false;
shouldMoveCamera = true;
+ freeCamera = false;

screenCenterPlayerOffsetX = 0;
screenCenterPlayerOffsetY = 0;
@@ -24363,6 +24466,28 @@ void LivingLifePage::pointerMove( float inX, float inY ) {
@@ -24476,6 +24579,28 @@ void LivingLifePage::pointerMove( float inX, float inY ) {
}


Expand Down Expand Up @@ -228,7 +228,7 @@ index 4a55e435e..7cf481f77 100644
}


@@ -27768,6 +27893,11 @@ void LivingLifePage::keyDown( unsigned char inASCII ) {
@@ -27881,6 +28006,11 @@ void LivingLifePage::keyDown( unsigned char inASCII ) {
keyHandledByKeybind = tryInteractionKeys( inASCII );
}

Expand All @@ -240,7 +240,7 @@ index 4a55e435e..7cf481f77 100644
// inspired by Awbz OneLife+
if( ( ( openSayFieldOnTypingLower && islower( inASCII ) )
|| ( openSayFieldOnTypingUpper && isupper( inASCII ) )
@@ -27976,6 +28106,9 @@ void LivingLifePage::keyUp( unsigned char inASCII ) {
@@ -28105,6 +28235,9 @@ void LivingLifePage::keyUp( unsigned char inASCII ) {
case ' ':
shouldMoveCamera = true;
break;
Expand Down
6 changes: 3 additions & 3 deletions click-through-heads
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/gameSource/LivingLifePage.cpp b/gameSource/LivingLifePage.cpp
index d63971ce9..9a5d9b10e 100644
index ec63deaeb..8e0809928 100644
--- a/gameSource/LivingLifePage.cpp
+++ b/gameSource/LivingLifePage.cpp
@@ -157,6 +157,8 @@ static int ignoreTallObjects = 1;
Expand All @@ -11,7 +11,7 @@ index d63971ce9..9a5d9b10e 100644

static int screenCenterPlayerOffsetX, screenCenterPlayerOffsetY;

@@ -2781,6 +2783,8 @@ LivingLifePage::LivingLifePage()
@@ -2880,6 +2882,8 @@ LivingLifePage::LivingLifePage()

showShiverSweat = SettingsManager::getIntSetting( "showShiverSweat", 0 );
setAnimationSweatSprite( SettingsManager::getIntSetting( "sweatDropSprite", 88 ) );
Expand All @@ -20,7 +20,7 @@ index d63971ce9..9a5d9b10e 100644

initLiveTriggers();

@@ -23721,6 +23725,15 @@ void LivingLifePage::checkForPointerHit( PointerHitRecord *inRecord,
@@ -23834,6 +23838,15 @@ void LivingLifePage::checkForPointerHit( PointerHitRecord *inRecord,

if( dist < minDistThatHits ) {
p->hit = true;
Expand Down
10 changes: 5 additions & 5 deletions click-through-trees
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/gameSource/LivingLifePage.cpp b/gameSource/LivingLifePage.cpp
index edc86e8be..4b79f8e37 100644
index 2a30b95bd..dff9d5ba2 100644
--- a/gameSource/LivingLifePage.cpp
+++ b/gameSource/LivingLifePage.cpp
@@ -153,6 +153,9 @@ static unsigned int maxDoubleClickFrames = 30;
Expand All @@ -12,7 +12,7 @@ index edc86e8be..4b79f8e37 100644
static int screenCenterPlayerOffsetX, screenCenterPlayerOffsetY;


@@ -2771,6 +2774,8 @@ LivingLifePage::LivingLifePage()
@@ -2870,6 +2873,8 @@ LivingLifePage::LivingLifePage()
//
// set to 0 for standard road following on any click
followRoadsOnlyWhileRunning = SettingsManager::getIntSetting( "followRoadsOnlyWhileRunning", 1 ) && maxDoubleClickFrames > 0;
Expand All @@ -21,7 +21,7 @@ index edc86e8be..4b79f8e37 100644

initLiveTriggers();

@@ -23443,7 +23448,8 @@ void LivingLifePage::checkForPointerHit( PointerHitRecord *inRecord,
@@ -23556,7 +23561,8 @@ void LivingLifePage::checkForPointerHit( PointerHitRecord *inRecord,
// all short objects are mouse-through-able

if( oID > 0 &&
Expand All @@ -31,7 +31,7 @@ index edc86e8be..4b79f8e37 100644
ObjectRecord *obj = getObject( oID );


@@ -23554,8 +23560,10 @@ void LivingLifePage::checkForPointerHit( PointerHitRecord *inRecord,
@@ -23667,8 +23673,10 @@ void LivingLifePage::checkForPointerHit( PointerHitRecord *inRecord,
false );

if( dist < minDistThatHits ) {
Expand All @@ -44,7 +44,7 @@ index edc86e8be..4b79f8e37 100644
// already hit a short object
// AND this object is tall
// (don't click through short behind short)
@@ -23566,7 +23574,12 @@ void LivingLifePage::checkForPointerHit( PointerHitRecord *inRecord,
@@ -23679,7 +23687,12 @@ void LivingLifePage::checkForPointerHit( PointerHitRecord *inRecord,
p->hitOurPlacementBehind = true;
}
}
Expand Down
Loading

0 comments on commit 78efc20

Please sign in to comment.