File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -3091,6 +3091,7 @@ gtime Npc::endTime(const Npc::Routine &r) const {
30913091 auto wtime = owner.time ();
30923092 auto time = wtime.timeInDay ();
30933093
3094+ // NOTE: should we consider time extension for invalid routine sequences?
30943095 if (r.end <r.start ) {
30953096 if (time<r.end )
30963097 return gtime (wtime.day (),r.end .hour (),r.end .minute ());
@@ -3101,6 +3102,10 @@ gtime Npc::endTime(const Npc::Routine &r) const {
31013102 return gtime (wtime.day ()+1 ,r.end .hour (),r.end .minute ()); else
31023103 return gtime (wtime.day (),r.end .hour (),r.end .minute ());
31033104 }
3105+ if (r.start ==r.end && r.end .toInt ()==0 ) {
3106+ // for example Rtn_Start_1081 in NTR is filled with zeros
3107+ return gtime (wtime.day ()+1 ,r.end .hour (),r.end .minute ());
3108+ }
31043109 // error - routine is not active now
31053110 return wtime;
31063111 }
Original file line number Diff line number Diff line change @@ -1015,7 +1015,7 @@ WayPath World::wayTo(const Npc &npc, const WayPoint &end) const {
10151015 return wmatrix->wayTo (wpoint.data (),wpoint.size (),p,end);
10161016 }
10171017
1018- GameScript & World::script () const {
1018+ GameScript& World::script () const {
10191019 return *game.script ();
10201020 }
10211021
You can’t perform that action at this time.
0 commit comments