Skip to content
This repository has been archived by the owner. It is now read-only.

ps2 menu, memorycard, pad and god knows what else #640

Merged
merged 11 commits into from Jun 29, 2020
Merged

ps2 menu, memorycard, pad and god knows what else #640

merged 11 commits into from Jun 29, 2020

Conversation

@Fire-Head
Copy link
Member

@Fire-Head Fire-Head commented Jun 27, 2020

No description provided.

@ghost
ghost approved these changes Jun 27, 2020
Copy link

@ghost ghost left a comment

small nitpicks, btw I've seen some hardcodes probably connected to the fps

src/core/Pad.cpp Outdated Show resolved Hide resolved
src/core/Pad.cpp Outdated Show resolved Hide resolved
src/core/Pad.cpp Show resolved Hide resolved
src/save/MemoryCard.cpp Show resolved Hide resolved
src/text/Text.cpp Show resolved Hide resolved
src/core/FrontendTriggers.h Outdated Show resolved Hide resolved
src/core/FrontendTriggers.h Outdated Show resolved Hide resolved
src/core/FrontendTriggers.h Outdated Show resolved Hide resolved
src/text/Text.cpp Outdated Show resolved Hide resolved
src/text/Text.cpp Outdated Show resolved Hide resolved
@@ -1773,8 +1803,6 @@ void GameInit()
}
}

// Not used anyway. PS2 main() port
#ifdef _WIN32
int
main(int argc, char *argv[])

This comment has been minimized.

@erorcun

erorcun Jun 28, 2020
Collaborator

This is needed on Linux, it can't read WinMain so WinMain is renamed to main() in there

This comment has been minimized.

@Fire-Head

Fire-Head Jun 28, 2020
Author Member

Nope, you are wrong.

#ifdef PS2

#endif

@Fire-Head Fire-Head merged commit a01fe76 into GTAmodding:master Jun 29, 2020
2 checks passed
2 checks passed
@appveyor
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants