Skip to content

Commit

Permalink
Fixed memos from deleted plots, faulty sell item info. Shrine sturdie…
Browse files Browse the repository at this point in the history
…r. Skill limit shown in chargen.
  • Loading branch information
jwvhewitt committed Apr 18, 2016
1 parent 0fd5074 commit 04cf282
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Series/STCdefault.txt
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ SDL_SPRITE <prop_default.png>
Frame 12


Prop 10
Prop 60
name <Shrine>
desig <SHRINE-1>
SDL_SPRITE <prop_default.png>
Expand Down
10 changes: 6 additions & 4 deletions arenascript.pp
Original file line number Diff line number Diff line change
Expand Up @@ -205,10 +205,12 @@ implementation
msg: String;
begin
while Part <> Nil do begin
msg := SAttValue( Part^.SA , Tag );
if msg <> '' then StoreSAtt( MemoList , msg );
CreateMemoList( Part^.SubCom , Tag );
CreateMemoList( Part^.InvCom , Tag );
if Part^.G <> GG_AbsolutelyNothing then begin
msg := SAttValue( Part^.SA , Tag );
if msg <> '' then StoreSAtt( MemoList , msg );
CreateMemoList( Part^.SubCom , Tag );
CreateMemoList( Part^.InvCom , Tag );
end;
Part := Part^.Next;
end;
end;
Expand Down
4 changes: 4 additions & 0 deletions history.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
- Shrine prop sturdier (STCdefault.txt)
- Exceeding skill number limit indicated in SDL chargen (randchar.pp)
- Fixed faulty SDL info display when selling items (services.pp)
- Fixed memos from deleted plots bug (arenascript.pp)
- Mecha Part Editor crash fixed (sdlinfo.pp)
- Tech Vulture can't remove integral parts (arenascript.pp)
- In ASCII mode, cursor should indicate position of PC (conmap.pp)
Expand Down
25 changes: 24 additions & 1 deletion randchar.pp
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ implementation
var
RCPC: GearPtr;
RCPromptMessage,RCDescMessage,RCCaption,RCHintMessage: String;
RC_NumPickedSkills: Integer;

Procedure RandCharRedraw;
{ Redraw the screen for SDL. }
Expand All @@ -63,6 +64,27 @@ implementation
CMessage( RCHintMessage , ZONE_CharGenHint.GetRect() , InfoGreen );
end;
end;

Procedure SkillsRedraw;
{ Redraw the screen for skill selection. }
begin
DrawCharGenBorder;
if RCPC <> Nil then begin
CharacterDisplay( RCPC , Nil, ZONE_CharGenChar );
if TooManySkillsPenalty( RCPC , RC_NumPickedSkills ) > 0 then begin
CMessage( RCCaption , ZONE_CharGenCaption.GetRect() , EnemyRed );
end else begin
CMessage( RCCaption , ZONE_CharGenCaption.GetRect() , InfoGreen );
end;
end;
GameMsg( RCDescMessage , ZONE_CharGenDesc.GetRect() , InfoGreen );
CMessage( RCPromptMessage , ZONE_CharGenPrompt.GetRect() , InfoGreen );
if RCHintMessage <> '' then begin
InfoBox( ZONE_CharGenHint.GetRect() );
CMessage( RCHintMessage , ZONE_CharGenHint.GetRect() , InfoGreen );
end;
end;

{$ENDIF}

Function SkillDesc( N: Integer ): String;
Expand Down Expand Up @@ -668,7 +690,8 @@ implementation
repeat
{$IFDEF SDLMODE}
RCCaption := MsgString( 'RANDCHAR_ASPCaption' ) + BStr( SkillPt );
T := SelectMenu( RPM , @RandCharRedraw );
RC_NumPickedSkills := NumPickedSkills;
T := SelectMenu( RPM , @SkillsRedraw );
{$ELSE}
if TooManySkillsPenalty( PC , NumPickedSkills ) > 0 then begin
CMessage( MsgString( 'RANDCHAR_ASPCaption' ) + BStr( SkillPt ) , ZONE_CharGenPrompt , EnemyRed );
Expand Down
5 changes: 3 additions & 2 deletions services.pp
Original file line number Diff line number Diff line change
Expand Up @@ -1343,10 +1343,11 @@ procedure PurchaseGear( GB: GameBoardPtr; PC,NPC,Part: GearPtr );
{$IFDEF SDLMODE}
SERV_GB := GB;
SERV_PC := PCChar;
SERV_Customer := PCChar;
SERV_NPC := NPC;
SERV_Info := PCInv^.InvCom;
SERV_Info := PCInv;
SERV_Menu := RPM;
N := SelectMenu( RPM , @BrowseListRedraw );
N := SelectMenu( RPM , @BrowseTreeRedraw );
{$ELSE}
N := SelectMenu( RPM );
{$ENDIF}
Expand Down

0 comments on commit 04cf282

Please sign in to comment.