OSDN -- Develop and Download Open Source Software
  • R/O
  • SSH
  • HTTPS

oricsdk: Commit


Commit MetaInfo

Revision1705 (tree)
Time2023-09-26 02:14:47
Authordbug

Log Message

Moved a few more strings out of game_main.c and into game_text.s and added French translation for these.

Change Summary

Incremental Difference

--- users/dbug/UpgradeTime/Encounter/FloppyBuilderVersion/code/game_defines.h (revision 1704)
+++ users/dbug/UpgradeTime/Encounter/FloppyBuilderVersion/code/game_defines.h (revision 1705)
@@ -113,6 +113,14 @@
113113 extern const char gTextClimbUpRope[]; // "You climb up the rope"
114114 extern const char gTextClimbDownRope[]; // "You climb down the rope"
115115 extern const char gTextAttachRopeToTree[]; // "You attach the rope to the tree"
116+extern const char gTextDeadDog[]; // "a dead dog"
117+extern const char gTextDeadThug[]; // "a dead thug"
118+extern const char gTextFoundSomething[]; // "You found something interesting"
119+extern const char gTextDogGrowlingAtYou[]; // "an alsatian growling at you"
120+extern const char gTextThugAsleepOnBed[]; // "a thug asleep on the bed",0
121+extern const char gTextNotDead[]; // "Not dead" - Debugging text
122+extern const char gTextDogJumpingAtMe[]; // "a dog jumping at me"
123+extern const char gTextThugShootingAtMe[]; // "a thug shooting at me"
116124
117125 // Error messages
118126 extern const char gTextErrorInvalidDirection[]; // "Impossible to move in that direction"
@@ -127,4 +135,16 @@
127135 extern const char gTextErrorItemNotPresent[]; // "This item does not seem to be present"
128136 extern const char gTextErrorCannotRead[]; // "I can't read that"
129137 extern const char gTextErrorCannotUseHere[]; // "I can't use it here"
138+extern const char gTextErrorDontKnowUsage[]; // "I don't know how to use that"
130139 extern const char gTextErrorCannotAttachRope[]; // "You can't attach the rope"
140+extern const char gTextErrorLadderInHole[]; // "The ladder is already in the hole"
141+extern const char gTextErrorCantClimbThat[]; // "I don't know how to climb that"
142+extern const char gTextErrorNeedPositionned[]; // "It needs to be positionned first"
143+extern const char gTextErrorItsNotHere[]; // "It's not here"
144+extern const char gTextErrorAlreadyDead[]; // "Already dead"
145+extern const char gTextErrorShouldSaveGirl[]; // "You are supposed to save her"
146+extern const char gTextErrorShouldSubdue[]; // "I should subdue him first"
147+extern const char gTextErrorAlreadySearched[]; // "You've already frisked him"
148+extern const char gTextErrorInappropriate[]; // "Probably inappropriate"
149+extern const char gTextErrorDeadDontMove[]; // "Dead don't move"
150+
--- users/dbug/UpgradeTime/Encounter/FloppyBuilderVersion/code/game_main.c (revision 1704)
+++ users/dbug/UpgradeTime/Encounter/FloppyBuilderVersion/code/game_main.c (revision 1705)
@@ -745,7 +745,7 @@
745745 else
746746 if (ladderLocation == e_LOCATION_INSIDEHOLE)
747747 {
748- PrintErrorMessage("The ladder is already in the hole");
748+ PrintErrorMessage(gTextErrorLadderInHole); // "The ladder is already in the hole"
749749 }
750750 }
751751 else
@@ -761,7 +761,7 @@
761761 break;
762762
763763 default:
764- PrintErrorMessage("I don't know how to use that");
764+ PrintErrorMessage(gTextErrorDontKnowUsage); // "I don't know how to use that"
765765 break;
766766 }
767767 }
@@ -782,7 +782,7 @@
782782 char ladderLocation = gItems[e_ITEM_Ladder].location;
783783 if (ladderLocation == e_LOCATION_INVENTORY)
784784 {
785- PrintErrorMessage("It needs to be positionned first");
785+ PrintErrorMessage(gTextErrorNeedPositionned); // "It needs to be positionned first"
786786 }
787787 else
788788 if (ladderLocation == e_LOCATION_INSIDEHOLE)
@@ -805,7 +805,7 @@
805805 break;
806806
807807 default:
808- PrintErrorMessage("I don't know how to climb that");
808+ PrintErrorMessage(gTextErrorCantClimbThat); // "I don't know how to climb that"
809809 break;
810810 }
811811 }
@@ -899,12 +899,12 @@
899899 item* itemPtr=&gItems[itemId];
900900 if (itemPtr->location != gCurrentLocation)
901901 {
902- PrintErrorMessage("It's not here");
902+ PrintErrorMessage(gTextErrorItsNotHere); // "It's not here"
903903 }
904904 else
905905 if (itemPtr->flags & ITEM_FLAG_DEAD)
906906 {
907- PrintErrorMessage("Already dead");
907+ PrintErrorMessage(gTextErrorAlreadyDead); // "Already dead"
908908 }
909909 else
910910 {
@@ -915,7 +915,7 @@
915915 case e_ITEM_Thug:
916916 gScore+=50;
917917 itemPtr->flags|=ITEM_FLAG_DEAD;
918- itemPtr->description="a dead thug";
918+ itemPtr->description=gTextDeadThug; // "a dead thug";
919919 LoadScene();
920920 break;
921921
@@ -922,12 +922,12 @@
922922 case e_ITEM_AlsatianDog:
923923 gScore+=50;
924924 itemPtr->flags|=ITEM_FLAG_DEAD;
925- itemPtr->description="a dead dog";
925+ itemPtr->description=gTextDeadDog; // "a dead dog";
926926 LoadScene();
927927 break;
928928
929929 case e_ITEM_YoungGirl:
930- PrintErrorMessage("You are supposed to save her");
930+ PrintErrorMessage(gTextErrorShouldSaveGirl); // "You are supposed to save her"
931931 break;
932932 }
933933 }
@@ -941,7 +941,7 @@
941941 item* itemPtr=&gItems[itemId];
942942 if (itemPtr->location != gCurrentLocation)
943943 {
944- PrintErrorMessage("It's not here");
944+ PrintErrorMessage(gTextErrorItsNotHere); // "It's not here"
945945 }
946946 else
947947 {
@@ -951,18 +951,18 @@
951951 case e_ITEM_Thug:
952952 if (!(itemPtr->flags & ITEM_FLAG_DEAD))
953953 {
954- PrintErrorMessage("I should subdue him first");
954+ PrintErrorMessage(gTextErrorShouldSubdue); // "I should subdue him first"
955955 }
956956 else
957957 if (gItems[e_ITEM_Pistol].location!=e_LOCATION_NONE)
958958 {
959- PrintErrorMessage("You've already frisked him");
959+ PrintErrorMessage(gTextErrorAlreadySearched); // "You've already frisked him"
960960 }
961961 else
962962 {
963963 gScore+=50;
964964 gItems[e_ITEM_Pistol].location = e_LOCATION_MASTERBEDROOM;
965- PrintInformationMessage("You found something interesting");
965+ PrintInformationMessage(gTextFoundSomething); // "You found something interesting"
966966 LoadScene();
967967 }
968968 break;
@@ -978,12 +978,12 @@
978978 item* itemPtr=&gItems[itemId];
979979 if (itemPtr->location != gCurrentLocation)
980980 {
981- PrintErrorMessage("It's not here");
981+ PrintErrorMessage(gTextErrorItsNotHere); // "It's not here"
982982 }
983983 else
984984 if (!(itemPtr->flags & ITEM_FLAG_DEAD))
985985 {
986- PrintErrorMessage("Not dead");
986+ PrintErrorMessage(gTextNotDead); // "Not dead"
987987 }
988988 else
989989 {
@@ -992,13 +992,13 @@
992992 {
993993 case e_ITEM_Thug:
994994 itemPtr->flags&=~ITEM_FLAG_DEAD;
995- itemPtr->description="a thug asleep on the bed";
995+ itemPtr->description=gTextThugAsleepOnBed; // "a thug asleep on the bed";
996996 LoadScene();
997997 break;
998998
999999 case e_ITEM_AlsatianDog:
10001000 itemPtr->flags&=~ITEM_FLAG_DEAD;
1001- itemPtr->description="an alsatian growling at you";
1001+ itemPtr->description=gTextDogGrowlingAtYou; // "an alsatian growling at you"
10021002 LoadScene();
10031003 break;
10041004 }
@@ -1012,12 +1012,12 @@
10121012 item* itemPtr=&gItems[itemId];
10131013 if (itemPtr->location != gCurrentLocation)
10141014 {
1015- PrintErrorMessage("It's not here");
1015+ PrintErrorMessage(gTextErrorItsNotHere); // "It's not here"
10161016 }
10171017 else
10181018 if (itemPtr->flags & ITEM_FLAG_DEAD)
10191019 {
1020- PrintErrorMessage("Dead don't move");
1020+ PrintErrorMessage(gTextErrorDeadDontMove); // "Dead don't move"
10211021 }
10221022 else
10231023 {
@@ -1026,18 +1026,18 @@
10261026 {
10271027 case e_ITEM_Thug:
10281028 gCurrentLocationPtr->script = gDescriptionThugAttacking;
1029- itemPtr->description="a thug shooting at me";
1029+ itemPtr->description=gTextThugShootingAtMe; // "a thug shooting at me"
10301030 LoadScene();
10311031 break;
10321032
10331033 case e_ITEM_AlsatianDog:
10341034 gCurrentLocationPtr->script = gDescriptionDogAttacking;
1035- itemPtr->description="a dog jumping at me";
1035+ itemPtr->description=gTextDogJumpingAtMe; // "a dog jumping at me"
10361036 LoadScene();
10371037 break;
10381038
10391039 case e_ITEM_YoungGirl:
1040- PrintErrorMessage("Probably impropriate");
1040+ PrintErrorMessage(gTextErrorInappropriate); // "Probably impropriate"
10411041 break;
10421042 }
10431043 }
--- users/dbug/UpgradeTime/Encounter/FloppyBuilderVersion/code/game_text.s (revision 1704)
+++ users/dbug/UpgradeTime/Encounter/FloppyBuilderVersion/code/game_text.s (revision 1705)
@@ -25,6 +25,14 @@
2525 _gTextClimbUpRope .byt "Vous grimpez la corde",0
2626 _gTextClimbDownRope .byt "Vous descendez la corde",0
2727 _gTextAttachRopeToTree .byt "Vous attachez la corde à l'arbre",0
28+_gTextDeadDog .byt "un chien mort",0
29+_gTextDeadThug .byt "un malfaiteur mort",0
30+_gTextFoundSomething .byt "Vous avez trouvé quelque chose",0
31+_gTextDogGrowlingAtYou .byt "un alsacien menacant",0
32+_gTextThugAsleepOnBed .byt "un malfaiteur assoupi sur le lit",0
33+_gTextNotDead .byt "Pas mort",0 // Debugging text
34+_gTextDogJumpingAtMe .byt "un chien qui me saute dessus",0
35+_gTextThugShootingAtMe .byt "un malfaiteur qui me tire dessus",0
2836 #else
2937 _gTextAskInput .byt "What are you going to do now?",0
3038 _gTextNothingHere .byt "There is nothing of interest here",0
@@ -40,6 +48,14 @@
4048 _gTextClimbUpRope .byt "You climb up the rope",0
4149 _gTextClimbDownRope .byt "You climb down the rope",0
4250 _gTextAttachRopeToTree .byt "You attach the rope to the tree",0
51+_gTextDeadDog .byt "a dead dog",0
52+_gTextDeadThug .byt "a dead thug",0
53+_gTextFoundSomething .byt "You found something interesting",0
54+_gTextDogGrowlingAtYou .byt "an alsatian growling at you",0
55+_gTextThugAsleepOnBed .byt "a thug asleep on the bed",0
56+_gTextNotDead .byt "Not dead",0 // Debugging text
57+_gTextDogJumpingAtMe .byt "a dog jumping at me",0
58+_gTextThugShootingAtMe .byt "a thug shooting at me",0
4359 #endif
4460
4561 // Error messages
@@ -59,6 +75,15 @@
5975 _gTextErrorDontKnowUsage .byt "Je ne sais pas l'utiliser",0
6076 _gTextErrorCannotAttachRope .byt "Impossible de l'attacher",0
6177 _gTextErrorLadderInHole .byt "L'échelle est déja dans le trou",0
78+_gTextErrorCantClimbThat .byt "Je ne sais pas grimper ca",0
79+_gTextErrorNeedPositionned .byt "Ca doit d'abort être en place",0
80+_gTextErrorItsNotHere .byt "Ca n'est pas là",0
81+_gTextErrorAlreadyDead .byt "Déjà mort",0
82+_gTextErrorShouldSaveGirl .byt "Vous êtes censé la sauver",0
83+_gTextErrorShouldSubdue .byt "Il faut d'abord le maitriser",0
84+_gTextErrorAlreadySearched .byt "Vous l'avez déjà fouillé",0
85+_gTextErrorInappropriate .byt "Probablement inapproprié",0
86+_gTextErrorDeadDontMove .byt "Les morts ne bougent pas",0
6287 #else
6388 _gTextErrorInvalidDirection .byt "Impossible to move in that direction",0
6489 _gTextErrorCantTakeNoSee .byt "You can only take something you see",0
@@ -75,6 +100,15 @@
75100 _gTextErrorDontKnowUsage .byt "I don't know how to use that",0
76101 _gTextErrorCannotAttachRope .byt "You can't attach the rope",0
77102 _gTextErrorLadderInHole .byt "The ladder is already in the hole",0
103+_gTextErrorCantClimbThat .byt "I don't know how to climb that",0
104+_gTextErrorNeedPositionned .byt "It needs to be positionned first",0
105+_gTextErrorItsNotHere .byt "It's not here",0
106+_gTextErrorAlreadyDead .byt "Already dead",0
107+_gTextErrorShouldSaveGirl .byt "You are supposed to save her",0
108+_gTextErrorShouldSubdue .byt "I should subdue him first",0
109+_gTextErrorAlreadySearched .byt "You've already frisked him",0
110+_gTextErrorInappropriate .byt "Probably inappropriate",0
111+_gTextErrorDeadDontMove .byt "Dead don't move",0
78112 #endif
79113
80114 _gTextLowerCaseAlphabet .byt "abcde",255-2,"f",255-2,"ghi",255-2,"jklmnopqrstuvwxyz",0
Show on old repository browser