Skip to content

Commit 09a0393

Browse files
Merge pull request #6 from rforzachamp821/RZWorkingBranch1.0.1
1.0.1 pull request
2 parents 64adae7 + c32e3ff commit 09a0393

File tree

10 files changed

+19
-13
lines changed

10 files changed

+19
-13
lines changed

CommandFiles/CommandFileAssets.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include <fstream>
99
#include <sstream>
1010
#include <iomanip>
11+
#include <chrono>
1112

1213
// A function to give an interface to modify and load RGB colour presets.
1314
void RGBColourPresets() {
@@ -263,7 +264,7 @@ void About(bool bFromTutorial) {
263264
"This is a public stable release build of ZeeTerminal, with an entirely new engine and components.\nThis program is made in C++, with a few very small parts of C." +
264265
"\n\nThis program uses the DirectShow API in the MediaPlayer command, licensed by Microsoft Corp. (c) Microsoft Corp.\n\n" +
265266
"This program uses the BASS API in the AudioPlayer command, licensed by Un4Seen Developments. (c) Un4Seen Developments.\n\n" +
266-
"This program uses the CarDodge game v0.6.0, accessible in the Game command. CarDodge is licensed under Ryan Zorkot with the MIT License. For more information, visit the archived repo: https://github.com/rforzachamp821/CarDodge\n\n"
267+
"This program uses the CarDodge game v0.6.0, accessible in the Game command. CarDodge is licensed under Rforzachamp821 with the MIT License. For more information, visit the archived repo: https://github.com/rforzachamp821/CarDodge\n\n"
267268
"\nZeeTerminal is licensed under the MIT License. The license and credits can be viewed on Page 4.\n\n"
268269
" _____ _____ _ _ \n"
269270
" |__ /___ __|_ _|__ _ __ _ __ ___ (_)_ __ __ _| |\n"
@@ -273,8 +274,8 @@ void About(bool bFromTutorial) {
273274
" ",
274275

275276
"___LICENSE AND CREDITS___\n\n"
276-
"Massive thank-you to my dad, Hazem Zorkot, for assisting with this project, including with the logo design, name, high-level component ideas, and lots of heads-up messages along the way.\n\n"
277-
"ZeeTerminal is licensed under the MIT License. Below is the license info:\n\nCopyright (c) 2024 Ryan Zorkot\n\n"
277+
"Massive thank-you to my dad, Hazem, for assisting with this project, including with the logo design, name, high-level component ideas, and lots of heads-up messages along the way.\n\n"
278+
"ZeeTerminal is licensed under the MIT License. Below is the license info:\n\nCopyright (c) 2025 Rforzachamp821\n\n"
278279
"Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal"
279280
" in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell"
280281
" copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n"
@@ -877,7 +878,7 @@ void DevTools(short int nToolNum) {
877878
if (_kbhit()) {
878879
if (_getch() == 27) break;
879880
}
880-
881+
881882
end = std::chrono::high_resolution_clock::now();
882883
std::cout << "Time: ";
883884
colour(LCYN, ConfigObjMain.sColourGlobalBack);

CommandFiles/Settings.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1084,6 +1084,7 @@ void LogFileSystemSettings(short int nChoice = 0, short int nChoiceLogging = 0,
10841084
}
10851085
}
10861086

1087+
// CarDodge Game Settings
10871088
void CarDodgeGameSettings(short int nChoiceMain = 0, int nChoiceCarTurnSpeed = 0, int nChoiceStartupCar = 0, int nChoiceForeground = 0, int nChoiceBackground = 0) {
10881089
OptionSelectEngine oseCarDodgeSettings;
10891090

@@ -1099,6 +1100,7 @@ void CarDodgeGameSettings(short int nChoiceMain = 0, int nChoiceCarTurnSpeed = 0
10991100
nChoiceMain = oseCarDodgeSettings.OptionSelect("Please select which setting you want to change relating to the Car Dodge game:", " ___CAR DODGE GAME SETTINGS___ ");
11001101
}
11011102

1103+
// Car Turn Speed Settings
11021104
if (nChoiceMain == 1) {
11031105
while (true) {
11041106
if (nChoiceCarTurnSpeed == 0) {
@@ -1107,7 +1109,7 @@ void CarDodgeGameSettings(short int nChoiceMain = 0, int nChoiceCarTurnSpeed = 0
11071109
colourSubheading(); // extra info colour is the same as subheading colour
11081110
std::cout << wordWrap("This speed is a measure of characters moved left/right per keypress, so higher numbers are faster.") << NOULINE_STR;
11091111
colour(ConfigObjMain.sColourGlobal, ConfigObjMain.sColourGlobalBack);
1110-
std::cout << "\nDefault Speed: 2\nCurrent Speed: " << ConfigObjMain.nCarDodgeCarTurningSpeed << wordWrap("\n\nInput 0 to exit. Turning speed cannot be lower than 1 or higher than 10.") << '\n';
1112+
std::cout << "\nDefault Speed: 4\nCurrent Speed: " << ConfigObjMain.nCarDodgeCarTurningSpeed << wordWrap("\n\nInput 0 to exit. Turning speed cannot be lower than 1 or higher than 10.") << '\n';
11111113

11121114
nChoiceCarTurnSpeed = NumInputi("Please input how fast you want the car to turn: > ");
11131115
}

Core/ZTConstDefinitions.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

33
// ZeeTerminal Source Code Version
4-
constexpr const char* ZT_VERSION = "1.0.0";
4+
constexpr const char* ZT_VERSION = "1.0.1";
55

66
// Array size for all argument arrays
77
constexpr int nArgArraySize = 256;

Engine/ConfigFile-System/ConfigFile-System.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class ConfigFileSystem
5151
bool bUserInputInfoLogging = false;
5252

5353
// CarDodge Game Settings
54-
int nCarDodgeCarTurningSpeed = 2; // chars the car will move by - cannot be more than 10, lower than 1
54+
int nCarDodgeCarTurningSpeed = 4; // chars the car will move by - cannot be more than 10, lower than 1
5555
int nCarDodgeGameStartupCar = 1; // Value can be from 1 to 6 (number on the menu)
5656
std::string sCarDodgeGameplayColourFore = LWHT; // Only affects car colours
5757
std::string sCarDodgeGameplayColourBack = BLK; // Only affects game background colour, borders aren't affected

GameFiles/CarDodge/CarDodge_CodeFiles/CarDodgeCore/CarDodgeCore.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
#include "../../../../Core/ZeeTerminalCore.h"
99
#include "../../../../Core/ZTFormattingDefinitions.h"
1010

11-
#include "../../RyRyCryptor/RyRyCryptor.h"
11+
#include "../../../../RyRyCryptor/RyRyCryptor.h"
1212
#include "../CarInfo/CarInfo.h"
1313
#include "CarDodgeCore.h"
14-
#include "../../GameFiles/GameHighScoresSystem/GameHighScoresSystem.h"
14+
#include "../../../../GameFiles/GameHighScoresSystem/GameHighScoresSystem.h"
1515

1616
CarInfo EnemyCars[128];
1717
CarInfo UserCar;

GameFiles/CarDodge/CarDodge_CodeFiles/CarDodgeMain/CarDodgeMain.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include "../../../../Engine/OptionSelectEngine/OptionSelectEngine.h"
88
#include "../CarDodgeCore/CarDodgeCore.h"
99
#include "../CarInfo/CarInfo.h"
10-
#include "../../GameFiles/GameHighScoresSystem/GameHighScoresSystem.h"
10+
#include "../../../../GameFiles/GameHighScoresSystem/GameHighScoresSystem.h"
1111
#include <conio.h>
1212

1313
extern short int nSessionConsoleHeight;

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,6 @@ TerminalApp Gen 1 is available in the following archive: https://github.com/rfor
2222

2323
**Note:** If you find any bugs or issues, or you want to give feedback, please do so in the 'Issues' tab above. It would be really helpful, thanks!
2424

25-
*ZeeTerminal was made by Ryan Zorkot. (c) 2023 Ryan Zorkot.*
25+
**Another note:** This application is recommended to run on a 120x30 character (BxH) sized terminal window.
26+
27+
*ZeeTerminal was made by Rforzachamp821. (c) 2025 Rforzachamp821.*

ZeeTerminal.aps

-40 Bytes
Binary file not shown.

ZeeTerminal.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* /____\___|\___||_|\___|_| |_| |_| |_|_|_| |_|\__,_|_|
1010
*
1111
*/
12-
// (c) Ryan Zorkot, 2024. Licensed under MIT.
12+
// (c) Rforzachamp821, 2025. Licensed under MIT.
1313
//
1414

1515
#include <iostream>
@@ -125,7 +125,7 @@ int main(int argc, char* argv[])
125125
bRunCommandLoopOnce = true; // One command from argument will end the terminal operation
126126

127127
}
128-
else if (sArgv[1] == "ZeeTerminalCore.h" || sArgv[1] == "--help") {
128+
else if (sArgv[1] == "-h" || sArgv[1] == "--help") {
129129
// Output help message for user
130130
std::cout << "___ZeeTerminal Help___\n\n__Syntax__:\nFor running a script: ZeeTerminal.exe <script filepath>\nFor running a singular command: ZeeTerminal.exe -c <command>\n\n"
131131
<< "If you would like to run a script OR command where either contains space characters, use quotation marks (\"\").\n --> For example: ZeeTerminal.exe \"C:\\Users\\Public\\A Test Script.txt\"\n\n"

ZeeTerminal.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@
128128
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
129129
<LanguageStandard>stdcpp20</LanguageStandard>
130130
<FloatingPointModel>Precise</FloatingPointModel>
131+
<LanguageStandard_C>stdc17</LanguageStandard_C>
131132
</ClCompile>
132133
<Link>
133134
<SubSystem>Console</SubSystem>

0 commit comments

Comments
 (0)