1
0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-21 12:49:10 +00:00
Commit Graph

946 Commits

Author SHA1 Message Date
6e75026c46 Attempt to de-messify MaxMain
... Similarly to MaxComponent, I'm not sure how much this helps. But, it
(should) compile. I hate 3dsm.
2012-12-22 17:16:11 -05:00
ad8e87370d Untangle MaxExport 2012-12-22 17:16:09 -05:00
586aa94e38 Untangle MaxConvert
Fix compilation as a result of hsWindows. Also, add precompiled header
support (this shaves off 9 seconds on my machine) and fix some warnings.
As we saw in the PCH-ization of pfPython, includes were untangled (to some
extent) and forward declarations were introduced where appropriate.
2012-12-22 17:16:08 -05:00
2dce76cb36 Smack MaxComponent
This is a huge, complicated project. Therefore, this untangling is not as
comprehensive as the others. It should compile faster and be a little bit
neater, but that's it. Don't expect the headers to look much better!
2012-12-22 17:16:07 -05:00
3ea82ca589 Be smarter about Pch.[h|cpp] files
As pointed out in #225, Pch.cpp looks suspiciously like a garbage file
when precompiled headers are disabled in cmake. To solve that, I have
changed the precompiled header function to add the Pch source files only
when pch is enabled. This should prevent future accidents.
2012-12-22 17:16:05 -05:00
bb4d36e69d Remove windoze include from hsThread.h 2012-12-22 17:16:01 -05:00
72000fd0c1 Fixes some oversights.
Okay, what moron left out the include guards on hsSTLStream.h? Come on,
man.
2012-12-22 17:15:21 -05:00
7785c9c85e Remove global Windows.h include
This is the beginning of efforts to reduce the scope of Windows.h. I have
shuttled it into hsWindows.h (again) and fixed the compilation of the
major apps. There is still some scope work that needs to be done, and the
Max plugin has not yet been addressed.
2012-12-22 17:15:14 -05:00
5de87cdaca Fix UnifiedTime collision
Win32's GetCurrentTime and plUnifiedTime::GetCurrentTime collided. Rather
than hacking around the solution by undefining GetCurrentTime, we rename
plUnifiedTime::GetCurrentTime to plUnifiedTime::GetCurrent. This fix is
less fiddly than an undef hack.
2012-12-21 21:04:14 -05:00
c8419b0107 Remove hsFileStream
It's unused windows-specific garbage.
2012-12-20 18:22:49 -05:00
75793e5182 Manual merge of Pull Request #232 from zrax/plString
Conflicts:
	Sources/Plasma/CoreLib/HeadSpin.h
2012-12-20 17:22:31 -05:00
66038d4fc2 Merge pull request #231 from dpogue/fixes
Linux fixes
2012-12-19 16:38:23 -08:00
e0e141fd01 Move Python string helper to the correct location 2012-12-18 18:01:56 -08:00
43a26190b1 Merge pull request #237 from cwalther/bink-stub
stub out plClient Bink support, part 2
2012-12-18 09:22:27 -08:00
e9835eda57 Add more functionality to the bink stubs to make them behave more like the previous implementation did when built without BINK_SDK_AVAILABLE.
In particular, the intro movie now exits immediately again rather than staying indefinitely.

The important difference is to send the completion callback in plBinkPlayer::NextFrame(), i.e. act as if we had reached the end of the movie.

Storing the filename is to keep plClient::IHandleMovieMsg() from deleting and recreating the plBinkPlayer on every message.

The changed return values are just to better match the previous behavior and probably don’t matter.
2012-12-18 15:49:41 +01:00
5f53ada44d stub out plClient Bink support 2012-12-15 23:58:34 -05:00
64214e1a7b Corrections as proposed by @branan. 2012-12-15 18:23:33 -08:00
a92fbea356 Get rid of const char* warning in plPythonPack. 2012-12-15 16:58:45 -08:00
4221b57baa Fix a whole bunch of clang warnings. 2012-12-15 16:46:20 -08:00
ca87b47ca8 Fix plResManager stricmp. 2012-12-15 16:08:14 -08:00
d1dd98c17b CoreLib fixes for Linux. 2012-12-15 16:06:41 -08:00
9f276e2c57 Add support for Visual Leak Detector, since valgrind doesn't support MSVC 2012-12-13 02:07:53 -08:00
49dfb4e546 Convert SDL (mostly) to plStrings 2012-12-13 02:06:41 -08:00
188171235e Add string split and tokenize functions 2012-12-13 02:06:41 -08:00
1b57055fd3 Take advantage of plString more in hsStream's String I/O functions 2012-12-13 02:06:41 -08:00
b3976524ee Merge pull request #229 from Hoikas/locdata-strings
LocalizationData String Stuff
2012-12-03 23:18:52 -08:00
165e79fa64 Throw out more error string concating 2012-11-28 20:36:37 -05:00
1bada0dfa2 Fixup tree dumping
Remove unnesecary conversions and string concats in the tree->log dumping
code.
2012-11-28 19:55:56 -05:00
d2b4a64409 Remove some std::wstring concating
Replace a weird error string stack with direct calls to the
LocalizationMgr log and its associated formatting helper. In cases where
indirection was needed, plString was introduced. This makes the code
cleaner and faster.
2012-11-28 19:25:07 -05:00
16c3190f14 That looks dangerous... 2012-11-28 19:05:16 -05:00
4ee424df34 Merge pull request #226 from Hoikas/no-encryption
Deprecate WDYS Encryption
2012-11-27 17:28:09 -08:00
caa12510de Merge pull request #224 from Hoikas/kill-transgaming
Kill transgaming
2012-11-27 17:23:52 -08:00
8aa9e25ec0 Merge pull request #221 from Hoikas/window-fixes
Window fixes
2012-11-18 14:02:27 -08:00
a69784bf4c Kill off Windows 9x AsyncCore
Hey, guess what? TransGaming was what needed that old, obsolete crap.
2012-11-18 16:59:47 -05:00
8a9c3ec177 Kill high level TransGaming support 2012-11-18 16:59:47 -05:00
2232f12378 Merge pull request #222 from Lyrositor/scroll-position
Add functions to fix KI Chat scrolling issue.
2012-11-18 10:16:04 -08:00
0ce539963a Merge pull request #228 from zrax/plString
plStrings part two

--HG--
rename : Sources/Plasma/PubUtilLib/plFile/hsFiles.cpp => Sources/Plasma/CoreLib/hsFiles.cpp
rename : Sources/Plasma/PubUtilLib/plFile/hsFiles.h => Sources/Plasma/CoreLib/hsFiles.h
rename : Sources/Plasma/PubUtilLib/plFile/hsFiles_Mac.cpp => Sources/Plasma/CoreLib/hsFiles_Mac.cpp
rename : Sources/Plasma/PubUtilLib/plFile/hsFiles_PS2.cpp => Sources/Plasma/CoreLib/hsFiles_PS2.cpp
rename : Sources/Plasma/PubUtilLib/plFile/hsFiles_Unix.cpp => Sources/Plasma/CoreLib/hsFiles_Unix.cpp
rename : Sources/Plasma/PubUtilLib/plFile/hsFiles_Win.cpp => Sources/Plasma/CoreLib/hsFiles_Win.cpp
rename : Sources/Plasma/PubUtilLib/plFile/plFileUtils.cpp => Sources/Plasma/CoreLib/plFileUtils.cpp
rename : Sources/Plasma/PubUtilLib/plFile/plFileUtils.h => Sources/Plasma/CoreLib/plFileUtils.h
2012-11-18 01:31:59 -08:00
3e92022db2 Fix additional issues from review 2012-11-18 01:14:06 -08:00
c68724765b Some minor cleanup for readability 2012-11-13 20:05:04 -08:00
b219c3c3cc Alright, this _TEMP_CONVERT_ stuff was a stupid idea 2012-11-13 18:40:13 -08:00
075c535e2c Some cleanup and a vararg plString usage fix 2012-11-12 22:58:15 -08:00
9cc3f404af Add Short-String Optimization to plString 2012-11-12 19:06:53 -08:00
92c5070736 Remove dependency on <functional> 2012-11-12 18:31:07 -08:00
041b1985e4 Fix paths and move GetSecureEncryptionKey so things compile again 2012-11-12 18:31:07 -08:00
403d2a896d Move plFileUtils and hsFiles to CoreLib
--HG--
rename : Sources/Plasma/PubUtilLib/plFile/hsFiles.cpp => Sources/Plasma/CoreLib/hsFiles.cpp
rename : Sources/Plasma/PubUtilLib/plFile/hsFiles.h => Sources/Plasma/CoreLib/hsFiles.h
rename : Sources/Plasma/PubUtilLib/plFile/hsFiles_Mac.cpp => Sources/Plasma/CoreLib/hsFiles_Mac.cpp
rename : Sources/Plasma/PubUtilLib/plFile/hsFiles_PS2.cpp => Sources/Plasma/CoreLib/hsFiles_PS2.cpp
rename : Sources/Plasma/PubUtilLib/plFile/hsFiles_Unix.cpp => Sources/Plasma/CoreLib/hsFiles_Unix.cpp
rename : Sources/Plasma/PubUtilLib/plFile/hsFiles_Win.cpp => Sources/Plasma/CoreLib/hsFiles_Win.cpp
rename : Sources/Plasma/PubUtilLib/plFile/plFileUtils.cpp => Sources/Plasma/CoreLib/plFileUtils.cpp
rename : Sources/Plasma/PubUtilLib/plFile/plFileUtils.h => Sources/Plasma/CoreLib/plFileUtils.h
2012-11-12 18:31:06 -08:00
03a1283c27 The licensing stuff was copied from an older code base... 2012-11-12 18:31:06 -08:00
8d8532f045 Fix encryption ASSumption
Now we test the file we're trying to write to. We still support legacy
xTEA BriceIsSmart/whatdoyousee files, but we will always make new files
unencrypted.
2012-11-12 20:51:56 -05:00
e26829594d Remove plLogDecrypt.
plLogDecrypt is devoid of purpose now that log encryption is gone.
2012-11-12 20:48:06 -05:00
b987f9719c Remove log and init file encryption.
This fixes issue #123, and is supposed to get rid of encryption for the status logs and the init files loaded at startup.
2012-11-12 20:48:05 -05:00
99650c7415 Merge pull request #225 from zrax/warn_cleanup
Warning cleanup
2012-11-12 17:46:45 -08:00