OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-15 10:54:18 +00:00
Code Releases Activity

Compare commits

base: OU:exploit-fix
Branches Tags
OU:master OU:ticket/56 OU:ticket/55 OU:working OU:ticket/50 OU:nextgen OU:working-2022q2 OU:working-2022q1 OU:working_subtitles OU:rarified/no-https-submodule OU:working_195 OU:rarified/vs2010project-fixes OU:rarified/directoryreorg OU:marten/Noikas-horplus-field-of-view OU:marten/boq-chat-name-completion OU:ticket/2 OU:marten/Hoikas-horplus-field-of-view OU:ticket/4 OU:marten/Filtik-chat-history-browsing OU:ticket/3 OU:rarified/unify-line-endings OU:rarified/huru-merge-fromhuru OU:rarified/huru-merge-work/cmake-building OU:rarified/huru-merge-work/code-cleanup OU:rarified/sdk-provisioning-1 OU:dpogue/pipeline-fix OU:rarified/sdk-reorg-1 OU:rarified/update-moul-patchbase OU:rarified/vs2010_default OU:VS2003_FINAL OU:hoikas/linkoutsync OU:rarified/findpagevalidate OU:rarified/movieplayer OU:hoikas/keycollector-1 OU:hoikas/scenenodes-1 OU:rarified/purefunctiondebug OU:rarified/VS2010-enable-pdb OU:cwalther/timetypes-1 OU:hoikas/keyleaks-1 OU:hoikas/newpatcher-1 OU:rarified/vs-multitool-dx9 OU:rarified/vs2003buildtargets OU:h-uru/restoreexceptionhandler OU:mdeforest/statusserverurl OU:huru-png-mipmap OU:rarified/plkeyref OU:pending OU:vs2010 OU:H'uru/Plasma_PR533 OU:rarified/work OU:rarified/gameserverportfix OU:mdeforest/changed-password-hashing-to-try-sha1-fir-1492090943988 OU:launcherstatusmessagecrash OU:bink-stub-2 OU:lostlogins OU:setpublic OU:textrendering OU:statusmessagecrash OU:build918chunks OU:bink-stub OU:scroll-position OU:avatar-physics OU:window-cursor OU:avatar-spawn OU:window-size OU:exploit-fix OU:cursors2 OU:msvc10 OU:plClipboard OU:landing OU:notify_int OU:moretools OU:dst OU:clickables-afk OU:jpeg OU:hgignore OU:gotopage OU:sdlsetindex-ou OU:cypythonide OU:cursors
OU:OPENURU_BUILD_212b OU:OPENURU_BUILD_212a OU:OPENURU_BUILD_212 OU:OPENURU_BUILD_211c OU:OPENURU_BUILD_211b OU:OPENURU_BUILD_211a OU:OPENURU_BUILD_211 OU:OPENURU_BUILD_209 OU:OPENURU_BUILD_207 OU:OPENURU_BUILD_205e OU:OPENURU_BUILD_205d OU:OPENURU_BUILD_205a OU:OPENURU_BUILD_205b OU:OPENURU_BUILD_205c OU:OPENURU_BUILD_205 OU:OPENURU_BUILD_200 OU:OPENURU_BUILD_200a OU:OPENURU_BUILD_195 OU:OPENURU_BUILD_194 OU:OPENURU_BUILD_188 OU:VS2003_FINAL OU:gamemgr OU:basic_cmake
..
compare: OU:rarified/gameserverportfix
Branches Tags
OU:master OU:ticket/56 OU:ticket/55 OU:working OU:ticket/50 OU:nextgen OU:working-2022q2 OU:working-2022q1 OU:working_subtitles OU:rarified/no-https-submodule OU:working_195 OU:rarified/vs2010project-fixes OU:rarified/directoryreorg OU:marten/Noikas-horplus-field-of-view OU:marten/boq-chat-name-completion OU:ticket/2 OU:marten/Hoikas-horplus-field-of-view OU:ticket/4 OU:marten/Filtik-chat-history-browsing OU:ticket/3 OU:rarified/unify-line-endings OU:rarified/huru-merge-fromhuru OU:rarified/huru-merge-work/cmake-building OU:rarified/huru-merge-work/code-cleanup OU:rarified/sdk-provisioning-1 OU:dpogue/pipeline-fix OU:rarified/sdk-reorg-1 OU:rarified/update-moul-patchbase OU:rarified/vs2010_default OU:VS2003_FINAL OU:hoikas/linkoutsync OU:rarified/findpagevalidate OU:rarified/movieplayer OU:hoikas/keycollector-1 OU:hoikas/scenenodes-1 OU:rarified/purefunctiondebug OU:rarified/VS2010-enable-pdb OU:cwalther/timetypes-1 OU:hoikas/keyleaks-1 OU:hoikas/newpatcher-1 OU:rarified/vs-multitool-dx9 OU:rarified/vs2003buildtargets OU:h-uru/restoreexceptionhandler OU:mdeforest/statusserverurl OU:huru-png-mipmap OU:rarified/plkeyref OU:pending OU:vs2010 OU:H'uru/Plasma_PR533 OU:rarified/work OU:rarified/gameserverportfix OU:mdeforest/changed-password-hashing-to-try-sha1-fir-1492090943988 OU:launcherstatusmessagecrash OU:bink-stub-2 OU:lostlogins OU:setpublic OU:textrendering OU:statusmessagecrash OU:build918chunks OU:bink-stub OU:scroll-position OU:avatar-physics OU:window-cursor OU:avatar-spawn OU:window-size OU:exploit-fix OU:cursors2 OU:msvc10 OU:plClipboard OU:landing OU:notify_int OU:moretools OU:dst OU:clickables-afk OU:jpeg OU:hgignore OU:gotopage OU:sdlsetindex-ou OU:cypythonide OU:cursors
OU:OPENURU_BUILD_212b OU:OPENURU_BUILD_212a OU:OPENURU_BUILD_212 OU:OPENURU_BUILD_211c OU:OPENURU_BUILD_211b OU:OPENURU_BUILD_211a OU:OPENURU_BUILD_211 OU:OPENURU_BUILD_209 OU:OPENURU_BUILD_207 OU:OPENURU_BUILD_205e OU:OPENURU_BUILD_205d OU:OPENURU_BUILD_205a OU:OPENURU_BUILD_205b OU:OPENURU_BUILD_205c OU:OPENURU_BUILD_205 OU:OPENURU_BUILD_200 OU:OPENURU_BUILD_200a OU:OPENURU_BUILD_195 OU:OPENURU_BUILD_194 OU:OPENURU_BUILD_188 OU:VS2003_FINAL OU:gamemgr OU:basic_cmake

90 Commits
exploit-fi ... rarified/g

Author SHA1 Message Date
rarified
0d518e3465 Merged branch to PR #42 including login hash from mdeforest 2019-03-31 16:31:06 -06:00
rarified
92e95d5a99 Add function NetCliAuthGetCurrentConnPort() to plNglGame to provide current Auth 
server port to Game client connection code.

For use where non-default port is being used for Auth/Game servers.
 2019-03-16 14:34:19 -06:00
rarified
8960d0b406 Merged in mdeforest/changed-password-hashing-to-try-sha1-fir-1492090943988 (Pull Request #42) 2017-05-15 15:30:16 -06:00
CyanWorlds
c888e43c73 Cleaned up password hashing to try SH1 then SH0. More comments and easier to modify. 2017-05-12 11:28:11 -07:00
CyanWorlds
947a64c05f Changed password hashing to try SHA-1 first and if that doesn't work then try SHA-0. This should allow shard owners to chose either SHA-1 or SHA-0 for their password hash without interfering with other shards. And allow them to change their password hash without requiring everyone to reset their passwords. 
This also allows for future expansion of new hash techniques to be added, of course the more hash techniques added the more delay at login for the lowest on the totem pole.
I have tested this against the MOULa shard that uses SHA-0 and it works, there is a slight flash of the "Connecting dialog" as it re-tries sending the login but if the user saves the password, there is no flash and no delay.
 2017-04-13 13:42:50 +00:00
rarified
627825dab2 Merged in mac_fife's nonemail_password_has (pull request #40) 2017-03-22 14:56:19 -06:00
Ian McIntosh
207bf3d62e Make all account types use the same password hash. Precursor to restoring MOULa account creation. 2017-03-18 19:09:16 +00:00
Christian Walther
791886bdab Merged in cwalther/cwe/launcherstatusmessagecrash (pull request #38) 
Don't crash the launcher when the HTTP request for getting the server status message fails

This should fix the crash in UruLauncher.exe after starting UruExplorer.exe, reported by Treehugger at http://forums.openuru.org/viewtopic.php?p=8976#p8976 . It is the same issue as addressed in pull request #31 for the login dialog.

Untested because testing it is hard when the launcher patches itself out.
 2017-02-18 16:21:28 +01:00
Christian Walther
b74e9f47bb Don't crash when the HTTP request for getting the server status message fails. 
Same thing as 82d9c3a57879, more or less.
 2017-02-17 22:54:30 +01:00
Christian Walther
1ab6781402 Merged in cwalther/cwe/setpublic (pull request #35) 
Let ptVault.setAgePublic accept ptVaultAgeInfoNode in addition to ptAgeInfoStruct

In this case it now also works for non-owners of the age. Previously it only worked for owners because the ageInfoStruct does not contain the vault node ID, so it needed to be looked up somewhere, and that was in the AgesIOwnFolder.

Prerequisite for hood auto-bump (MOULSCRIPT-ou PR #22).

From H-uru/Plasma#461.
 2015-04-03 23:10:31 +02:00
Christian Walther
d8a5f03e9c Merged in cwalther/cwe/textrendering (pull request #36) 
Shadowed Chat and Player List Text

This implements the (existing but unimplemented) plDynamicTextMap::kFontShadowed flag, making the text of the mini KI (player list and chat) better readable on light and patterned backgrounds.

For best results, an additional Python change is recommended: MOULSCRIPT-ou PR #23.

From H-uru/Plasma#392.
 2015-04-03 23:09:00 +02:00
Christian Walther
2abd744ba6 Merged in ian_mcintosh/cwe-ou/lostlogins (pull request #33) 
Fix for forgotten logins when removable media attached.

Incorporated suggestions from PR #32 which this replaces. Moved CloseHandle as suggested.

Addresses JIRA CWE-37 Corrects incorrect assignment of drive letter to the drive actually being interrogated and ignores removable drive types such as CD/DVD and USB Flash and HDs.

Alternative solution that moves login credentials to the registry is being prepared by Deledrius - H-uru/Plasma PR#448 may be a better long term fix - I'm simply offering what I have.
 2015-04-03 23:08:09 +02:00
Christian Walther
2e73c3667a Merged in cwalther/cwe/statusmessagecrash (pull request #31) 
Don't crash when the HTTP request for getting the server status message fails

This fixes the crash that keeps Windows 7 users out of the game when support.cyanworlds.com is down, reported with some regularity e.g. at http://mystonline.com/forums/viewtopic.php?f=40&t=27352 .

Apparently on Windows 7, unlike on Windows XP and contrary to its documentation, WinHttpReadData() does not zero its lpdwNumberOfBytesRead argument when called with an invalid request, so the lack of error checking here bites.
 2015-04-03 23:07:05 +02:00
Christian Walther
4eb7810d81 Merged in Lyrositor/cwe-ou/scroll-position (pull request #26) 
Add functions to fix KI Chat scrolling issue.

These two Python/Plasma functions are used in the moul-scripts fix for the scrolling KI Chat issue.

It must be pulled in before https://bitbucket.org/OpenUru_org/moulscript-ou/pull-request/19
 2015-04-03 23:03:29 +02:00
Christian Walther
0b9bcc3e91 Merged in cwalther/cwe/bink-stub-2 (pull request #37) 
Fix stuck-in-intro-cave bug

This reintroduces the plBinkPlayer stub removed in 8a1346b in order to fix the bug where a new player is stuck in the intro cave with the rotating wall until it occurs to them to press the esc key.

I have not spent much effort on checking that this is the correct and minimal change but it appears to work for me.

This is a quick fix, the definitive solution will be to port VP9/Opus support from https://github.com/H-uru/Plasma/pull/458.
 2015-04-03 23:02:21 +02:00
Christian Walther
343c6ffbda Reintroduce plBinkPlayer stub 
and reenable as much USE_BINK_SDK stuff as empirically needed to get the Yeesha intro movie cave to disappear on its own, as before merging Cyan's Build 918.

Not the cleanest way, but I'm trying to minimize effort spent on this until we can get the proper solution, VP9 video support, from https://github.com/H-uru/Plasma/pull/458 .
 2015-02-13 22:42:13 +01:00
Ian McIntosh
c68640f76c winmain.cpp edited online with Bitbucket 2014-12-25 22:52:25 +00:00
Christian Walther
ce5719c83f Let ptVault.setAgePublic accept ptVaultAgeInfoNode in addition to ptAgeInfoStruct. 
In this case it now also works for non-owners of the age. Previously it only worked for owners because the ageInfoStruct does not contain the vault node ID, so it needed to be looked up somewhere, and that was in the AgesIOwnFolder.
 2014-12-25 00:26:39 +01:00
Ian McIntosh
c71e8fbee0 Fix for forgotten logins when removable media attached. Incorporated suggestion from previous PR #32 on OpenUru_org/CWE-ou 2014-10-14 18:45:30 +01:00
Christian Walther
21e2a6de7b Fix MSVC7 warnings. 2014-08-23 21:10:55 +02:00
Christian Walther
8b62863419 Don't crash when the HTTP request for getting the server status message fails. 2014-08-15 20:19:38 +02:00
Christian Walther
9c609b9fd8 Modulate text shadow opacity by the alpha of the text color to make the player lists fade properly. 
Also, the text of the faded-out player list is re-rendered with alpha == 0 every time the mouse enters its area, do a little less needless work in that case.
 2014-06-07 18:22:41 +02:00
Anne Marije v/d Meer
d1c86267b3 Const getters 2014-04-25 12:17:47 +02:00
Christian Walther
6b2dedf547 Make font flags available to Python in PlasmaConstants. 2014-04-12 10:22:07 +02:00
Anne Marije v/d Meer
192e4a252c Fix comment Hoikas 2014-04-25 11:57:33 +02:00
Christian Walther
c0b63e4237 Fix ptGUIControl.setFontFlags(). 
Previous revision didn't work, many controls retained their shadows because they never got the new flags from the color scheme and put them into the dynamic text map. I haven't checked if any more of the many control classes are affected, but those that we need in the KI right now are covered.
 2014-04-10 22:59:37 +02:00
Anne Marije v/d Meer
020f8a1ba0 Move methods to pyGUIControl to pyGUIControlTextBox. 2014-04-09 11:21:28 +02:00
Anne Marije v/d Meer
39ff487ca8 add python api to set flags 
Clean up unwanted changes caused by IDE extension -.-

Reworked implementation
 2014-04-01 16:38:12 +02:00
Christian Walther
a0bbef1819 Undo the kRenderJustXForceLeft bugfix of 4 commits back. 
The fix (adding adjustment of fRenderInfo.fDestPtr) made kRenderJustXForceLeft behave as intended (left-aligning the edge of the bitmap rather than the side bearing of the first character) but cuts off shadows in some places (e.g. at the left edges of "BUDDIES" and "NEIGHBORS" in the mini KI). To ensure enough space for the shadow, and considering that all content was developed and visually optimized with the bug in place, it seems better to preserve the buggy behavior and make kRenderJustXForceLeft work exactly like kRenderJustXLeft.
 2014-04-06 17:19:42 +02:00
Christian Walther
5f5dd2745f Restore include paths and libraries for WinHttp and Ogg/Vorbis, eliminated by the conflict resolution in 8a7d72003333 
Should work for Cyan too because plClient uses the same libraries.

I wonder what the purpose of the Release_Patcher configuration is and whether we should be using that one, which already has all this stuff (with slight differences).
 2014-01-02 12:36:17 +01:00
Christian Walther
6ebf8ae3a3 Restore the OU changes to AllClient-ou.sln that were lost in AllClient.sln 8a7d72003333/e7bb0959f189 
- Remove plCyDebug and NetDiag which we don't have (from ef365800375c)
- Remove pfCCR which we no longer have (since 791583dea277)
- Add plUruLauncher and plClientPatcher (from ef365800375c)
- Add plFileEncrypt, plFileSecure, plPythonPack (from f3497c6d7f6d)

I also took the liberty of restoring the post-build copy step for plFileEncrypt and plFileSecure. If Cyan doesn't want that, we can probably put it in a separate project that is only part of AllClient-ou.sln but not AllClient.sln.
 2014-01-02 11:24:15 +01:00
Christian Walther
9ea22b7f65 Copy AllClient.sln to AllClient-ou.sln 
(separate commit since when copying and modifying in the same commit, hg doesn't seem to show differences)
 2014-01-02 10:48:37 +01:00
Christian Walther
015acf9c7f Link DX libraries using library search paths rather than by their full paths, as for some reason Cyan appears to have them in DX9.0c/Lib while we have them in DX9.0c/Lib/x86. See also e7bb0959f189. 2014-01-01 23:55:31 +01:00
Christian Walther
5a10e2095a Link eax.lib and eaxguid.lib using #pragma comment(lib) rather than naming them in the linker options (brought back by e7bb0959f189). This is evil, but in the absence of more appropriate features (vsprops) in VS 2003 allows us to avoid separate projects or configurations for the cases with/without EAX and all the duplication that would bring with it. 
Needs testing by someone who has EAX.
 2014-01-01 23:36:09 +01:00
Christian Walther
8096f8b77d Restore parts of pfCCR that are still needed by other projects, undoing part of 791583dea277: 
- plCCRMgr.h which is still needed by plAvatarMgr.cpp (plCCRError only - if there is more in this file at Cyan, that definition should be split out into a separate header)
- Stubs for pyCCRMgr{|Glue|Glue2}.cpp which are still part of the pfPython project as well as pfCCRConsoleCommands.cpp which is still part of the pfConsole project. This is under the assumption that these files still exist with nontrivial contents at Cyan - if not, they could just be removed from the projects. Requires adjustment by Cyan to build with PLASMA_CCR_RELEASE.
- Put more missing includes and calls under #ifdef PLASMA_CCR_RELEASE
 2014-01-01 21:14:13 +01:00
Christian Walther
68f59ef839 Restore OpenAL include paths that were eliminated by the conflict resolution in 8a7d72003333. 
Should have no influence when building with EAX_SDK_AVAILABLE.
 2014-01-01 18:17:23 +01:00
Christian Walther
b0b8ed6306 Remove preprocessor definition EAX_SDK_AVAILABLE, undoing most of 52c6f0317f79 
Those who have the EAX SDK should indicate this on the command line by adding /DEAX_SDK_AVAILABLE to environment variable CL.

Trying to keep common project files and configurations between OU and Cyan for now, we'll see how that goes.
 2014-01-01 12:25:56 +01:00
Christian Walther
189c9b0221 Merge MOULa build 918 from Cyan 
Too many changes to describe in detail, see commits on parent branch build918chunks.
Some of them break buildability outside of Cyan, to be fixed in subsequent commits.

Merge conflicts in some .sln and .vcproj files all resolved by taking the Cyan version.
 2014-01-02 23:43:54 +01:00
Christian Walther
9743c73a44 Remove Bink stubs in anticipation of cyantific debinkification 2014-01-02 23:34:39 +01:00
Christian Walther
f50eaba306 Remove some apparently needless differences to Cyan's projects (from ef365800375c) 2014-01-02 23:31:38 +01:00
Christian Walther
e0b363f3a2 Merge Cyan's monolithic Build 918 commit and its broken down version. 
No differences to either parent to indicate that the two are identical.
 2013-12-31 16:57:05 +01:00
Christian Walther
7bc602870d Build 918 chunk 17: Define EAX_SDK_AVAILABLE 
MarkD: My thought was for the long term was to put most of the differences in the project and solution configurations, so there would be less differences in the sources. EAX is a good example - I put the #define for EAX_SDK_AVAILABLE in the projects that used it with the thinking that the fans would create new projects that would not have EAX_SDK_AVAILABLE and would create and use a different configuration in the AllClient solution. Cyan would use the "Release" config and the fans use something like "Release-ou" to build with. But maybe there are just too many differences.
 2013-12-31 16:21:33 +01:00
Christian Walther
e37277050d Build 918 chunk 16: Remove Bink references from projects, enclose uses of video functionality in #ifdef USE_BINK_SDK 
MarkD: We felt that the fan de-BINKing did not go far enough.
CW: I suspect (haven't tested yet) that it's the cause of the bug that we see on MOULa but did not on Minkata where the rotating wall behind the missing Yeesha intro video stays indefinitely, with no obvious way out for the player, until it occurs to them to use the ESC key
MarkD: Ah. I think you are right. An oversight that can be easily corrected - maybe in the python code so that Ian can see the rotating wall for a few seconds and then auto continue on.
 2013-12-31 16:10:39 +01:00
Christian Walther
a270bbbe5c Build 918 chunk 15: Miscellaneous odds and ends 2013-12-31 15:55:52 +01:00
Christian Walther
660f19a72a Build 918 chunk 14: Change dx9.0csdk and dx8.1sdk paths to DX9.0c 2013-12-31 15:48:49 +01:00
Christian Walther
f2dd437321 Build 918 chunk 13: Define NX_PHYSICS_SDK_VERSION 2013-12-31 15:42:46 +01:00
Christian Walther
47b02dfc68 Build 918 chunk 12: Change CLASS_C_SUBNET_MASK 
MarkD: Used in the server code.
 2013-12-31 15:41:01 +01:00
Christian Walther
0525163e56 Build 918 chunk 11: Unconditionally enable LogMsgDebug() 
MarkD: This is used in the server code.
 2013-12-31 15:35:35 +01:00
Christian Walther
2cabf18bfa Build 918 chunk 10: Remove pfCCR 2013-12-31 15:32:02 +01:00
Christian Walther
31fd3e28c7 Build 918 chunk 9: Remove empty folders plGClip, Cypython, PythonLib 2013-12-31 15:27:27 +01:00
Christian Walther
071410a4d8 Build 918 chunk 8: Add OpenSSL include folder, replace libcrypto.a by libeay32.lib 
CW: This probably has to do with changing from dynamic to static linking of OpenSSL.
 2013-12-31 15:22:48 +01:00
Christian Walther
a72cbd9248 Build 918 chunk 7: Add project plPluginJPEG and use it in AllDlls.sln 
Copy of plJPEG with added preprocessor definition IJL_SDK_AVAILABLE.

CW: I'm guessing that's the workaround for the missing JPEG textures issue we found during the 918 update verification.
MarkD: Exactly.
 2013-12-31 14:47:01 +01:00
Christian Walther
bb96412ffc Build 918 chunk 6: Use libjpeg instead of IJL 2013-12-31 14:32:37 +01:00
Christian Walther
c30992af4d Build 918 chunk 5: Adjustments to updated zlib+libpng 2013-12-31 12:49:08 +01:00
Christian Walther
ff38a5f9d2 Build 918 chunk 4: Build number, release notes 2013-07-27 18:18:01 +02:00
Christian Walther
1ba92e5a66 Build 918 chunk 3: Add plClientResMgr where forgotten in CWE-ou 2013-07-27 18:16:57 +02:00
Christian Walther
ece6e6c063 Build 918 chunk 2: update from CWE-ou 2013-07-27 16:57:46 +02:00
Christian Walther
c8611a072b Build 918 chunk 1: Revert MsDevProjects to (almost) the state of build 906 (0a67197a0c11) 
Except for the addition of the plClipboard project, the partial CWE-ou state that was mistakenly taken into CWE in "Build 912" (a757a1fda0a3) was never actually used to build MOULa products.
 2013-07-24 22:22:58 +02:00
CyanWorlds
46a0cf6206 Build 918 2013-07-05 15:28:19 -07:00
Adam Johnson
3825317e5e Link shadowed text rendering to the plDynamicTextMap::kFontShadowed flag. 
Conveniently enough, this existing but unimplemented flag is already set mostly the way we want it in the current PRPs.
 2013-07-04 20:13:03 -04:00
Christian Walther
3b89e66d2d Tag begin and end of the submission to Cyan 2013-04-25 12:58:11 +02:00
Christian Walther
f44eea59b9 Merged in cwalther/cwe/window-cursor (pull request #25) 
Free the cursor, update

Updates to pull request #21 by Hoikas that fix the issue that quick mouse moves while walking/looking by mouse could get the cursor out of the window and break the continuous turning.

From H-uru PR #221 "Window fixes".
 2013-04-12 20:41:04 +02:00
Christian Walther
499432b4f0 Merged in Lyrositor/cwe-ou/exploit-fix (pull request #24) 
Fix remote code execution through Python.Cheat and Python.RunFile

An exploit fixed by boq. Original pull request: https://github.com/H-uru/Plasma/pull/218
This somewhat modifies the syntax used for running Python.Cheat; it's still easier to use it directly in Python, though.
 2013-04-12 20:39:04 +02:00
Christian Walther
bb044d2932 Merged in Skoader/cwe-ou/avatar-spawn (pull request #22) 
Fix intermittent spawn bug

This fixes missing quabs in Ahnonay.
 2013-04-12 20:16:30 +02:00
Christian Walther
96ae8a88ed Merged in Skoader/cwe-ou/avatar-physics (pull request #20) 
Avatar physics update

A significant and much needed cleanup of the avatar physics code. It resolves numerous issue with and greatly simplifies the physx character controller implementation.

While there is still room for improvement, this is a good starting point.

Avatars now jump consistently, regardless of cpu speed. Fixes unexpected camera transitions with entering/exiting some subworlds. (Teledahn elevator) Fixes a jitter in animated subworlds. (Er'cana harvester) Dynamic controllers are correctly positioned on the ground. (Jalak) Much improved interaction with dynamic physicals.

Other physics related issues may or may not be addressed.
 2013-04-12 20:15:35 +02:00
Skoader
2d38c34b3c Merged in cwalther/cwe/bink-stub (pull request #27) 
Port of H-uru #236 and #237. This adds stubs for the removed Bink files, to make things compile and run again, with just enough functionality to replicate the previous behavior when built without BINK_SDK_AVAILABLE, i.e. movies are treated as zero-length.
 2013-01-20 22:26:06 +11:00
Christian Walther
f03a837642 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
Adam Johnson
30d140b8a0 stub out plClient Bink support 2012-12-15 23:58:34 -05:00
Lyrositor
c6016223f2 Add functions to fix KI Chat scrolling issue. 
These two Python/Plasma functions are used in the moul-scripts fix for the scrolling KI Chat issue.
 2012-11-19 17:46:30 -05:00
Skoader
7a47e52ac6 Rework PhysX collision flutter bug workaround 
To better handle erroneous trigger events under the new timing method, use the number
of times the simulation has actually advanced instead of the number of evals received.

Cleaned up a bit.
 2012-11-12 03:28:53 +11:00
Skoader
2c06d3b2d3 Only apply height correction to human avatars. 2012-11-12 01:40:30 +11:00
Skoader
79377e2b95 Clear achieved linear velocity on disabled avatars. 2012-11-11 23:48:51 +11:00
Skoader
3d14321f26 Clear impact velocity on WalkingStrategy Reset. 
Fixes landing behaviours incorrectly firing after a brain transition.
 2012-11-11 22:59:04 +11:00
Adam Johnson
d638355955 Track mouse ups/downs for releasing purposes 2012-11-03 01:22:56 -04:00
Skoader
03ecfe00b4 Increase height correction to match graphical representation 
Provides more accurate interaction with detectors when the avatar is moving up or down.
Also decreases the severity of the PhysX trigger hull bug in some detectors.
This change doesn't affect world collisions.
 2012-10-26 18:13:22 +11:00
Skoader
860b071bb2 Clear linear velocity after each update. 2012-10-26 18:03:40 +11:00
Skoader
d02cde1703 Disabled avatar updates 
Only update disabled avatars between steps if in a subworld and then don't interpolate their position.
 2012-10-26 17:36:04 +11:00
Skoader
32ba4e06e2 Fix controlled flight bug 
fControlledFlight state should be handled outside of the physics step.
 2012-10-26 10:48:30 +11:00
Adam Johnson
a617803fd0 Capture the mouse on clicks 
This hack prevents the cursor from leaving the window when panning the
camera or changing directions quickly. This is important for those with
high mouse sensitivities.
 2012-10-23 23:21:50 -04:00
Skoader
ae8d1d39bb Fix intermittent spawn bug 
Flush the transform when avatars are explicitly spawned on load. e.g. Ahnonay quabs.
 2012-10-23 14:22:22 +11:00
Skoader
b5296d614f Fix warping an avatar triggers all detectors along the path 
When explicitly moving an avatar over the given threshold, teleport the underlying
actor most of the way before moving the controller.
 2012-10-23 13:45:21 +11:00
Skoader
87b8dfae09 Fix subworld transition bug 
Use the actual global location, not the interpolated location when moving
between subworlds. Rebuild the controller cache.
 2012-10-22 12:57:16 +11:00
Skoader
025fb1fb02 Improve simulation timing at low frame rates. 
Increased kDefaultMaxDelta to 0.15.
Added a small bias to combat a truncation issue.
 2012-10-13 21:21:33 +11:00
Christian Walther
264bc3355a Fix horizontal mouse-look while standing still. 2012-09-28 22:44:23 +02:00
Skoader
e92dc59db2 Updated plPXPhysicalControllerCore to match 69377bc74f2e 
While based heavily on the old implementation, this is essentially a rewrite.

Notable changes -
Controllers are now updated at the same fixed frequency as the simulation.
Resulting output is interpolated between steps to precisely match the frame delta.
Physics work is only done when enough time has passed to perform a step.

The kinematic actor that followed around the controller has been removed.
The underlying kinematic actor created by the NxController is now used for triggering.
A new sim group was added for a kinematically controlled avatar.

2 unused files removed -
plPXPhysicalController.h & plPXPhysicalController.cpp
 2012-06-16 21:48:32 +10:00
Skoader
383346c1aa Refactor avatar movement code 
plMovementStrategy classes have been reworked and completely replace all plAvatarControllers.
While based on the old implementation, plPhysicalControllerCore has essentially been rewritten.
Remnants of long gone physical "actions" have been removed.

4 files removed -
plAVCallbackAction.h & plAVCallbackAction.cpp
plAntiGravAction.h & plAntiGravAction.cpp

This revision will not compile, requires new plPXPhysicalControllerCore implementation.
 2012-06-16 13:35:59 +10:00
Christian Walther
b343e389ab Implement shadowed text rendering. 
Intended to make KI text (player list and chat) better readable on light and patterned backgrounds. In this WIP, all text on GUI controls is rendered shadowed.
 2012-01-25 22:16:19 +01:00
Christian Walther
e02141055a Use premultiplied alpha for plDynamicTextMaps on GUI controls. 
This fixes the irregular dark fringes around light text when not exactly pixel-aligned that are caused by independent interpolation of color and alpha. It also makes calculations simpler for things to come.
 2011-12-30 15:10:47 +01:00
Christian Walther
1f0277e3e0 Pixel-accurately clip characters to the available space instead of omitting whole characters that stick out. 
In addition to being a prerequisite for shadowed text, this also fixes an issue sometimes seen at the bottom of the mini KI player list where characters with a descender were missing.
 2014-04-03 22:17:45 +02:00
Adam Johnson
db5e451622 Fix #303 2013-07-04 18:14:58 -04:00
164 changed files with 4744 additions and 6784 deletions
Expand all files Collapse all files

41
MOULOpenSourceClientPlugin/Plasma20/Docs/ReleaseNotes/ReleaseNotes.txt
View File

@ -1,31 +1,18 @@
Welcome to MYST Online:UruLive!
.
.
Thanks to all the fan contributors!
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
Release notes for build 918
- Fixed Console documentation
- Allow clickables while sitting or AFK
- Fixed various JPEG issues
- Free the cursor
- Fixed improper calculated initial window size
- Improved cursors
- Removed broken share from Sharper's Office link
- Fixed GreatZero stain glass to be random
- Avatar physics updated
- Fix pellet points stealing
- Bink removed
- Fixed remote code exec with Python.Cheat and RunFile

3
MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/Apps/plClient/plClient.vcxproj
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug_Internal|Win32">
@ -403,6 +403,7 @@
<ClInclude Include="..\..\..\..\Sources\Plasma\Apps\PlClient\plClient.h" />
<ClInclude Include="..\..\..\..\Sources\Plasma\Apps\plClient\plClientCreatable.h" />
<ClInclude Include="..\..\..\..\Sources\Plasma\Apps\plClient\res\resource.h" />
<ClInclude Include="..\..\..\..\Sources\Plasma\Apps\plClient\loginfix.h" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\..\Sources\Plasma\Apps\plClient\res\banner.bmp" />

5
MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/Apps/plClient/plClient.vcxproj.filters
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
@ -45,6 +45,9 @@
<ClInclude Include="..\..\..\..\Sources\Plasma\Apps\plClient\res\resource.h">
<Filter>Resource Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\Sources\Plasma\Apps\plClient\loginfix.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\..\Sources\Plasma\Apps\plClient\res\banner.bmp">

16
MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/FeatureLib/pfSurface/pfSurface.vcxproj
View File

@ -276,22 +276,6 @@
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_Internal|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\..\..\Sources\Plasma\FeatureLib\pfSurface\plLayerBink.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug_Internal|Win32'">Disabled</Optimization>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug_Internal|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_Internal|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug_Internal|Win32'">EnableFastChecks</BasicRuntimeChecks>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release_Internal|Win32'">MaxSpeed</Optimization>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release_Internal|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_Internal|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\..\..\Sources\Plasma\FeatureLib\pfSurface\plLayerMovie.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug_Internal|Win32'">Disabled</Optimization>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>

3
MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/FeatureLib/pfSurface/pfSurface.vcxproj.filters
View File

@ -26,9 +26,6 @@
<ClCompile Include="..\..\..\..\Sources\Plasma\FeatureLib\pfSurface\plLayerAVI.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\Sources\Plasma\FeatureLib\pfSurface\plLayerBink.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\Sources\Plasma\FeatureLib\pfSurface\plLayerMovie.cpp">
<Filter>Source Files</Filter>
</ClCompile>

4
MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/PubUtilLib/plAvatar/plAvatar.vcxproj
View File

@ -328,7 +328,6 @@
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_Internal|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\..\..\Sources\Plasma\PubUtilLib\plAvatar\plAntiGravAction.cpp" />
<ClCompile Include="..\..\..\..\Sources\Plasma\PubUtilLib\plAvatar\plArmatureEffects.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug_Internal|Win32'">Disabled</Optimization>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
@ -555,7 +554,6 @@
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_Internal|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\..\..\Sources\Plasma\PubUtilLib\plAvatar\plAvCallbackAction.cpp" />
<ClCompile Include="..\..\..\..\Sources\Plasma\PubUtilLib\plAvatar\plAvLadderModifier.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug_Internal|Win32'">Disabled</Optimization>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
@ -807,7 +805,6 @@
<ClInclude Include="..\..\..\..\Sources\Plasma\PubUtilLib\plAvatar\plAGMasterSDLModifier.h" />
<ClInclude Include="..\..\..\..\Sources\Plasma\PubUtilLib\plAvatar\plAGModifier.h" />
<ClInclude Include="..\..\..\..\Sources\Plasma\PubUtilLib\plAvatar\plAnimStage.h" />
<ClInclude Include="..\..\..\..\Sources\Plasma\PubUtilLib\plAvatar\plAntiGravAction.h" />
<ClInclude Include="..\..\..\..\Sources\Plasma\PubUtilLib\plAvatar\plArmatureEffects.h" />
<ClInclude Include="..\..\..\..\Sources\Plasma\PubUtilLib\plAvatar\plArmatureMod.h" />
<ClInclude Include="..\..\..\..\Sources\Plasma\PubUtilLib\plAvatar\plAvatarClothing.h" />
@ -825,7 +822,6 @@
<ClInclude Include="..\..\..\..\Sources\Plasma\PubUtilLib\plAvatar\plAvBrainHuman.h" />
<ClInclude Include="..\..\..\..\Sources\Plasma\PubUtilLib\plAvatar\plAvBrainRideAnimatedPhysical.h" />
<ClInclude Include="..\..\..\..\Sources\Plasma\PubUtilLib\plAvatar\plAvBrainSwim.h" />
<ClInclude Include="..\..\..\..\Sources\Plasma\PubUtilLib\plAvatar\plAvCallbackAction.h" />
<ClInclude Include="..\..\..\..\Sources\Plasma\PubUtilLib\plAvatar\plAvDefs.h" />
<ClInclude Include="..\..\..\..\Sources\Plasma\PubUtilLib\plAvatar\plAvLadderModifier.h" />
<ClInclude Include="..\..\..\..\Sources\Plasma\PubUtilLib\plAvatar\plAvTask.h" />

12
MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/PubUtilLib/plAvatar/plAvatar.vcxproj.filters
View File

@ -35,9 +35,6 @@
<ClCompile Include="..\..\..\..\Sources\Plasma\PubUtilLib\plAvatar\plAnimStage.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\Sources\Plasma\PubUtilLib\plAvatar\plAntiGravAction.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\Sources\Plasma\PubUtilLib\plAvatar\plArmatureEffects.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@ -86,9 +83,6 @@
<ClCompile Include="..\..\..\..\Sources\Plasma\PubUtilLib\plAvatar\plAvBrainSwim.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\Sources\Plasma\PubUtilLib\plAvatar\plAvCallbackAction.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\Sources\Plasma\PubUtilLib\plAvatar\plAvLadderModifier.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@ -163,9 +157,6 @@
<ClInclude Include="..\..\..\..\Sources\Plasma\PubUtilLib\plAvatar\plAnimStage.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\Sources\Plasma\PubUtilLib\plAvatar\plAntiGravAction.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\Sources\Plasma\PubUtilLib\plAvatar\plArmatureEffects.h">
<Filter>Header Files</Filter>
</ClInclude>
@ -217,9 +208,6 @@
<ClInclude Include="..\..\..\..\Sources\Plasma\PubUtilLib\plAvatar\plAvBrainSwim.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\Sources\Plasma\PubUtilLib\plAvatar\plAvCallbackAction.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\Sources\Plasma\PubUtilLib\plAvatar\plAvDefs.h">
<Filter>Header Files</Filter>
</ClInclude>

16
MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/PubUtilLib/plPipeline/plPipeline.vcxproj
View File

@ -245,22 +245,6 @@
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_Internal|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\..\..\Sources\Plasma\PubUtilLib\plPipeline\plBinkPlayer.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug_Internal|Win32'">Disabled</Optimization>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug_Internal|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug_Internal|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug_Internal|Win32'">EnableFastChecks</BasicRuntimeChecks>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release_Internal|Win32'">MaxSpeed</Optimization>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release_Internal|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release_Internal|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\..\..\Sources\Plasma\PubUtilLib\plPipeline\plCaptureRender.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug_Internal|Win32'">Disabled</Optimization>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>

3
MOULOpenSourceClientPlugin/Plasma20/MSVC10Projects/Plasma/PubUtilLib/plPipeline/plPipeline.vcxproj.filters
View File

@ -23,9 +23,6 @@
<ClCompile Include="..\..\..\..\Sources\Plasma\PubUtilLib\plPipeline\hsGDDrawDllLoad.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\Sources\Plasma\PubUtilLib\plPipeline\plBinkPlayer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\Sources\Plasma\PubUtilLib\plPipeline\plCaptureRender.cpp">
<Filter>Source Files</Filter>
</ClCompile>

59
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/AllDlls/AllDlls.sln
View File

@ -47,6 +47,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MaxMain", "..\Tools\MaxMain
{3BF79823-CD88-4F09-8BCB-A13D39481322} = {3BF79823-CD88-4F09-8BCB-A13D39481322}
{4E991726-D69F-4786-A873-DF37FB4DABF9} = {4E991726-D69F-4786-A873-DF37FB4DABF9}
{30A84728-A436-40B9-A009-B117407145C2} = {30A84728-A436-40B9-A009-B117407145C2}
{FEB4D52D-8D4E-4520-A490-ADE06159B650} = {FEB4D52D-8D4E-4520-A490-ADE06159B650}
{58BE352F-CDB2-4A08-AC62-981800D018B0} = {58BE352F-CDB2-4A08-AC62-981800D018B0}
{907DBE31-5B7D-483D-AAF7-CABC24434EA7} = {907DBE31-5B7D-483D-AAF7-CABC24434EA7}
{5CB24835-47C1-4AE7-900E-70CBD1CC1DEA} = {5CB24835-47C1-4AE7-900E-70CBD1CC1DEA}
@ -64,6 +65,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MaxMain", "..\Tools\MaxMain
{65C4DE61-E599-4F0F-9B75-66C0DA887BB6} = {65C4DE61-E599-4F0F-9B75-66C0DA887BB6}
{C664C563-FA33-4E48-BE77-7CCCD922B040} = {C664C563-FA33-4E48-BE77-7CCCD922B040}
{D6D56A64-A79B-4F48-BB9D-8C216D66632F} = {D6D56A64-A79B-4F48-BB9D-8C216D66632F}
{CA2D4E65-EA68-465F-843A-4AF75243B474} = {CA2D4E65-EA68-465F-843A-4AF75243B474}
{A927606C-7646-43C0-A3BB-B21836CC7D02} = {A927606C-7646-43C0-A3BB-B21836CC7D02}
{8E44FB70-5EA0-4D33-B829-E4D16D7C11E3} = {8E44FB70-5EA0-4D33-B829-E4D16D7C11E3}
{CA208971-6C77-47F6-AA4B-FB6ECC071132} = {CA208971-6C77-47F6-AA4B-FB6ECC071132}
@ -90,7 +92,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MaxMain", "..\Tools\MaxMain
{87B244B0-EAC3-4109-A395-898D1CFF0EBE} = {87B244B0-EAC3-4109-A395-898D1CFF0EBE}
{E8FE47B0-DF75-4D9F-9096-0BC204239B52} = {E8FE47B0-DF75-4D9F-9096-0BC204239B52}
{7A5E02B6-896A-49C2-8016-139CE23B3654} = {7A5E02B6-896A-49C2-8016-139CE23B3654}
{69E240B8-0ED6-4397-9DA6-133CC14F9E25} = {69E240B8-0ED6-4397-9DA6-133CC14F9E25}
{F57EFCBB-9B7F-46D2-946B-D5DCA4D6C921} = {F57EFCBB-9B7F-46D2-946B-D5DCA4D6C921}
{20917EBD-2A7E-49F5-A638-F5864265FF8C} = {20917EBD-2A7E-49F5-A638-F5864265FF8C}
{CFAA9EBF-A502-41F6-9784-0FC9CE7BFBA2} = {CFAA9EBF-A502-41F6-9784-0FC9CE7BFBA2}
@ -263,10 +264,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plIntersect", "..\Plasma\Pu
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plJPEG", "..\Plasma\PubUtilLib\plJPEG\plJPEG.vcproj", "{69E240B8-0ED6-4397-9DA6-133CC14F9E25}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plMath", "..\Plasma\PubUtilLib\plMath\plMath.vcproj", "{FCFFAE8F-D233-44D2-AAAD-4100FA274A32}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
@ -487,6 +484,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plCyDebug", "..\Plasma\Apps
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plClientResMgr", "..\Plasma\PubUtilLib\plClientResMgr\plClientResMgr.vcproj", "{17A0AA3A-8445-4C66-FE58-0A5C222CC474}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plClipboard", "..\Plasma\PubUtilLib\plClipboard\plClipboard.vcproj", "{CA2D4E65-EA68-465F-843A-4AF75243B474}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plPluginJPEG", "..\Plasma\PubUtilLib\plPluginJPEG\plPluginJPEG.vcproj", "{FEB4D52D-8D4E-4520-A490-ADE06159B650}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
@ -876,16 +885,6 @@ Global
{0AE17996-56DF-4E88-8681-B115786D0DC9}.Release.Build.0 = Release|Win32
{0AE17996-56DF-4E88-8681-B115786D0DC9}.Release_Server.ActiveCfg = Release|Win32
{0AE17996-56DF-4E88-8681-B115786D0DC9}.Release_Server.Build.0 = Release|Win32
{69E240B8-0ED6-4397-9DA6-133CC14F9E25}.Debug.ActiveCfg = Debug|Win32
{69E240B8-0ED6-4397-9DA6-133CC14F9E25}.Debug.Build.0 = Debug|Win32
{69E240B8-0ED6-4397-9DA6-133CC14F9E25}.Debug_Server.ActiveCfg = Debug|Win32
{69E240B8-0ED6-4397-9DA6-133CC14F9E25}.Debug_Server.Build.0 = Debug|Win32
{69E240B8-0ED6-4397-9DA6-133CC14F9E25}.Ethereal Build.ActiveCfg = Release|Win32
{69E240B8-0ED6-4397-9DA6-133CC14F9E25}.Ethereal Build.Build.0 = Release|Win32
{69E240B8-0ED6-4397-9DA6-133CC14F9E25}.Release.ActiveCfg = Release|Win32
{69E240B8-0ED6-4397-9DA6-133CC14F9E25}.Release.Build.0 = Release|Win32
{69E240B8-0ED6-4397-9DA6-133CC14F9E25}.Release_Server.ActiveCfg = Release|Win32
{69E240B8-0ED6-4397-9DA6-133CC14F9E25}.Release_Server.Build.0 = Release|Win32
{FCFFAE8F-D233-44D2-AAAD-4100FA274A32}.Debug.ActiveCfg = Debug|Win32
{FCFFAE8F-D233-44D2-AAAD-4100FA274A32}.Debug.Build.0 = Debug|Win32
{FCFFAE8F-D233-44D2-AAAD-4100FA274A32}.Debug_Server.ActiveCfg = Debug|Win32
@ -1436,6 +1435,36 @@ Global
{DE62CF05-8E3E-40A4-967D-330216C2D2ED}.Release.Build.0 = Release|Win32
{DE62CF05-8E3E-40A4-967D-330216C2D2ED}.Release_Server.ActiveCfg = Release|Win32
{DE62CF05-8E3E-40A4-967D-330216C2D2ED}.Release_Server.Build.0 = Release|Win32
{17A0AA3A-8445-4C66-FE58-0A5C222CC474}.Debug.ActiveCfg = Debug|Win32
{17A0AA3A-8445-4C66-FE58-0A5C222CC474}.Debug.Build.0 = Debug|Win32
{17A0AA3A-8445-4C66-FE58-0A5C222CC474}.Debug_Server.ActiveCfg = Debug|Win32
{17A0AA3A-8445-4C66-FE58-0A5C222CC474}.Debug_Server.Build.0 = Debug|Win32
{17A0AA3A-8445-4C66-FE58-0A5C222CC474}.Ethereal Build.ActiveCfg = Debug|Win32
{17A0AA3A-8445-4C66-FE58-0A5C222CC474}.Ethereal Build.Build.0 = Debug|Win32
{17A0AA3A-8445-4C66-FE58-0A5C222CC474}.Release.ActiveCfg = Release|Win32
{17A0AA3A-8445-4C66-FE58-0A5C222CC474}.Release.Build.0 = Release|Win32
{17A0AA3A-8445-4C66-FE58-0A5C222CC474}.Release_Server.ActiveCfg = Release|Win32
{17A0AA3A-8445-4C66-FE58-0A5C222CC474}.Release_Server.Build.0 = Release|Win32
{CA2D4E65-EA68-465F-843A-4AF75243B474}.Debug.ActiveCfg = Debug|Win32
{CA2D4E65-EA68-465F-843A-4AF75243B474}.Debug.Build.0 = Debug|Win32
{CA2D4E65-EA68-465F-843A-4AF75243B474}.Debug_Server.ActiveCfg = Debug|Win32
{CA2D4E65-EA68-465F-843A-4AF75243B474}.Debug_Server.Build.0 = Debug|Win32
{CA2D4E65-EA68-465F-843A-4AF75243B474}.Ethereal Build.ActiveCfg = Debug|Win32
{CA2D4E65-EA68-465F-843A-4AF75243B474}.Ethereal Build.Build.0 = Debug|Win32
{CA2D4E65-EA68-465F-843A-4AF75243B474}.Release.ActiveCfg = Release|Win32
{CA2D4E65-EA68-465F-843A-4AF75243B474}.Release.Build.0 = Release|Win32
{CA2D4E65-EA68-465F-843A-4AF75243B474}.Release_Server.ActiveCfg = Release|Win32
{CA2D4E65-EA68-465F-843A-4AF75243B474}.Release_Server.Build.0 = Release|Win32
{FEB4D52D-8D4E-4520-A490-ADE06159B650}.Debug.ActiveCfg = Debug|Win32
{FEB4D52D-8D4E-4520-A490-ADE06159B650}.Debug.Build.0 = Debug|Win32
{FEB4D52D-8D4E-4520-A490-ADE06159B650}.Debug_Server.ActiveCfg = Debug|Win32
{FEB4D52D-8D4E-4520-A490-ADE06159B650}.Debug_Server.Build.0 = Debug|Win32
{FEB4D52D-8D4E-4520-A490-ADE06159B650}.Ethereal Build.ActiveCfg = Release|Win32
{FEB4D52D-8D4E-4520-A490-ADE06159B650}.Ethereal Build.Build.0 = Release|Win32
{FEB4D52D-8D4E-4520-A490-ADE06159B650}.Release.ActiveCfg = Release|Win32
{FEB4D52D-8D4E-4520-A490-ADE06159B650}.Release.Build.0 = Release|Win32
{FEB4D52D-8D4E-4520-A490-ADE06159B650}.Release_Server.ActiveCfg = Release|Win32
{FEB4D52D-8D4E-4520-A490-ADE06159B650}.Release_Server.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection

1474
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/Apps/AllClient/AllClient-ou.sln Normal file
View File

File diff suppressed because it is too large Load Diff

554
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/Apps/AllClient/AllClient.sln
View File

File diff suppressed because it is too large Load Diff

39
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/Apps/plClient/plClient.vcproj
View File

@ -21,7 +21,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="&quot;../../../../SDKs/XPlatform/Cypython-2.3.3/Include&quot;;&quot;../../../../SDKs/XPlatform/Cypython-2.3.3/PC&quot;;../../../../../StaticSDKs/Win32/HawkVoice/src;../../../../../StaticSDKs/Win32/HawkVoice/Release;../../../../../StaticSDKs/Win32/dx9.0c/include;../../../../Sources/Plasma/CoreLib;../../../../Sources/Plasma/NucleusLib;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/FeatureLib;../../../../Sources/Plasma/FeatureLib/inc;&quot;../../../../SDKs/XPlatform/Cypython-2.3.3/pyconfig_static&quot;;../../../../../StaticSDKs/Win32/PlatformSDK/Include"
AdditionalIncludeDirectories="&quot;../../../../SDKs/XPlatform/Cypython-2.3.3/Include&quot;;&quot;../../../../SDKs/XPlatform/Cypython-2.3.3/PC&quot;;../../../../../StaticSDKs/Win32/HawkVoice/src;../../../../../StaticSDKs/Win32/HawkVoice/Release;../../../../../StaticSDKs/Win32/dx9.0c/include;../../../../Sources/Plasma/CoreLib;../../../../Sources/Plasma/NucleusLib;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/FeatureLib;../../../../Sources/Plasma/FeatureLib/inc;&quot;../../../../SDKs/XPlatform/Cypython-2.3.3/pyconfig_static&quot;;../../../../../StaticSDKs/Win32/PlatformSDK/Include;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@ -39,11 +39,11 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="winhttp.lib ogg_static_d.lib vorbis_static_d.lib vorbisfile_static_d.lib ksproxy.lib strmiids.lib eax.lib wininet.lib vfw32.lib winmm.lib ijl15l.lib libcrypto.a ws2_32.lib version.lib odbc32.lib odbccp32.lib eaxguid.lib libspeex.lib binkw32.lib Rpcrt4.lib largeint.lib Iphlpapi.lib OpenAL32.lib libpngd.lib"
AdditionalDependencies="winhttp.lib ogg_static_d.lib vorbis_static_d.lib vorbisfile_static_d.lib ksproxy.lib strmiids.lib wininet.lib vfw32.lib winmm.lib libjpeg.lib libeay32.lib ws2_32.lib version.lib odbc32.lib odbccp32.lib d3dx9.lib dinput8.lib dplayx.lib dsound.lib DxErr9.lib dxguid.lib libspeex.lib Rpcrt4.lib largeint.lib Iphlpapi.lib OpenAL32.lib libpngd.lib"
OutputFile="Debug/plClient_dbg.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="&quot;..\..\..\..\..\StaticSDKs\XPlatform\expat-1.95.7\StaticLibs\Win32&quot;;&quot;..\..\..\..\..\StaticSDKs\Win32\speex-1.0.1\win32\libspeex\Release&quot;;..\..\..\..\..\StaticSDKs\Win32\Bink\lib;..\..\..\..\..\StaticSDKs\Win32\eax\lib;..\..\..\..\..\StaticSDKs\Win32\oggvorbis\lib;..\..\..\..\..\STATICSDKS\XPLATFORM\STLPORT\lib;..\..\..\..\..\STATICSDKS\Win32\ijl\lib;..\..\..\..\..\StaticSDKs\Win32\WMSDK\lib;..\..\..\..\..\StaticSDKs\Win32\OpenSSL\lib;..\..\..\..\..\StaticSDKs\Win32\dx9.0csdk\lib;..\..\..\..\..\StaticSDKs\Win32\PhysX\lib\win32;..\..\..\..\..\StaticSDKs\Win32\OpenAL 1.1 with EFX SDK\libs\Win32;..\..\..\..\..\StaticSDKs\Win32\PlatformSDK\Lib;&quot;..\..\..\..\..\StaticSDKs\XPlatform\png\lib&quot;"
AdditionalLibraryDirectories="&quot;..\..\..\..\..\StaticSDKs\XPlatform\expat-1.95.7\StaticLibs\Win32&quot;;&quot;..\..\..\..\..\StaticSDKs\Win32\speex-1.0.1\win32\libspeex\Release&quot;;..\..\..\..\..\StaticSDKs\Win32\eax\lib;..\..\..\..\..\StaticSDKs\Win32\oggvorbis\lib;..\..\..\..\..\STATICSDKS\XPLATFORM\STLPORT\lib;&quot;..\..\..\..\..\StaticSDKs\XPlatform\jpeg-8c-rgba&quot;;..\..\..\..\..\StaticSDKs\Win32\WMSDK\lib;..\..\..\..\..\StaticSDKs\Win32\OpenSSL\lib;..\..\..\..\..\StaticSDKs\Win32\DX9.0c\Lib;..\..\..\..\..\StaticSDKs\Win32\DX9.0c\Lib\x86;..\..\..\..\..\StaticSDKs\Win32\PhysX\lib\win32;&quot;..\..\..\..\..\StaticSDKs\Win32\OpenAL 1.1 with EFX SDK\libs\Win32&quot;;..\..\..\..\..\StaticSDKs\Win32\PlatformSDK\Lib;..\..\..\..\..\StaticSDKs\XPlatform\png\lib"
IgnoreDefaultLibraryNames="libc.lib,libcd.lib,libci.lib,libcid.lib,libcmtd.lib,libcmt.lib"
GenerateDebugInformation="TRUE"
AssemblyDebug="1"
@ -67,7 +67,6 @@ xcopy /Y /E /I ..\..\..\..\Scripts\Python\plasma\*.py ..\..\..\..\test\python\pl
xcopy /Y /E /I ..\..\..\..\Scripts\Python\system\*.py ..\..\..\..\test\python\system
xcopy /Y /E /I ..\..\..\..\Scripts\Python\system\*.pyd ..\..\..\..\test\python\system
xcopy /Y ..\..\..\..\..\StaticSDKs\Win32\EAX\lib\eax.dll ..\..\..\..\test\
xcopy /Y ..\..\..\..\..\StaticSDKs\Win32\Bink\lib\binkw32.dll ..\..\..\..\test\
xcopy /Y ..\..\..\..\..\StaticSDKs\Win32\PhysX\Bin\win32\NxCharacter.dll ..\..\..\..\test\
xcopy /Y ..\..\..\..\..\StaticSDKs\Win32\PhysX\Bin\win32\NxCooking.dll ..\..\..\..\test\
xcopy /Y ..\..\..\..\..\StaticSDKs\Win32\PhysX\Bin\win32\NxExtensions.dll ..\..\..\..\test\
@ -125,11 +124,11 @@ xcopy /Y ..\..\..\..\Sources\Plasma\Apps\plClient\external\resource.dat ..\..\..
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="winhttp.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib strmiids.lib wininet.lib vfw32.lib winmm.lib libjpeg.lib libeay32.lib ws2_32.lib version.lib odbc32.lib odbccp32.lib libspeex.lib Rpcrt4.lib largeint.lib Iphlpapi.lib OpenAL32.lib libpng.lib"
AdditionalDependencies="winhttp.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib strmiids.lib wininet.lib vfw32.lib winmm.lib libjpeg.lib libeay32.lib ws2_32.lib version.lib odbc32.lib odbccp32.lib d3dx9.lib dinput8.lib dplayx.lib dsound.lib DxErr9.lib dxguid.lib libspeex.lib Rpcrt4.lib largeint.lib Iphlpapi.lib OpenAL32.lib libpng.lib"
OutputFile=".\Release/plClient.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="&quot;..\..\..\..\..\StaticSDKs\XPlatform\expat-1.95.7\StaticLibs\Win32&quot;;&quot;..\..\..\..\..\StaticSDKs\Win32\speex-1.0.1\Win32\libspeex\Release&quot;;..\..\..\..\..\StaticSDKs\Win32\Bink\lib;..\..\..\..\..\StaticSDKs\Win32\oggvorbis\lib;..\..\..\..\..\STATICSDKS\XPLATFORM\STLPORT\lib;..\..\..\..\..\StaticSDKs\Win32\WMSDK\lib;..\..\..\..\..\StaticSDKs\Win32\OpenSSL\lib;..\..\..\..\..\StaticSDKs\Win32\DX9.0c\Lib\x86;..\..\..\..\..\StaticSDKs\Win32\PhysX\lib\win32;&quot;..\..\..\..\..\StaticSDKs\Win32\OpenAL 1.1 with EFX SDK\libs\Win32&quot;;..\..\..\..\..\StaticSDKs\Win32\PlatformSDK\Lib;&quot;..\..\..\..\..\StaticSDKs\XPlatform\jpeg-8c-rgba&quot;;&quot;..\..\..\..\..\StaticSDKs\XPlatform\png\lib&quot;"
AdditionalLibraryDirectories="&quot;..\..\..\..\..\StaticSDKs\XPlatform\expat-1.95.7\StaticLibs\Win32&quot;;&quot;..\..\..\..\..\StaticSDKs\Win32\speex-1.0.1\Win32\libspeex\Release&quot;;..\..\..\..\..\StaticSDKs\Win32\oggvorbis\lib;..\..\..\..\..\STATICSDKS\XPLATFORM\STLPORT\lib;..\..\..\..\..\StaticSDKs\Win32\WMSDK\lib;..\..\..\..\..\StaticSDKs\Win32\OpenSSL\lib;..\..\..\..\..\StaticSDKs\Win32\DX9.0c\Lib;..\..\..\..\..\StaticSDKs\Win32\DX9.0c\Lib\x86;..\..\..\..\..\StaticSDKs\Win32\PhysX\lib\win32;&quot;..\..\..\..\..\StaticSDKs\Win32\OpenAL 1.1 with EFX SDK\libs\Win32&quot;;..\..\..\..\..\StaticSDKs\Win32\PlatformSDK\Lib;&quot;..\..\..\..\..\StaticSDKs\XPlatform\jpeg-8c-rgba&quot;;..\..\..\..\..\StaticSDKs\XPlatform\png\lib;..\..\..\..\..\StaticSDKs\Win32\EAX\lib"
IgnoreDefaultLibraryNames="libc.lib,libci.lib,libcmt.lib"
GenerateDebugInformation="TRUE"
AssemblyDebug="1"
@ -156,8 +155,7 @@ xcopy /Y /E /I ..\..\..\..\Sources\Plasma\PubUtilLib\plSDL\SDL\*.sdl ..\..\..\..
xcopy /Y /E /I ..\..\..\..\Scripts\Python\plasma\*.py ..\..\..\..\test\python\plasma
xcopy /Y /E /I ..\..\..\..\Scripts\Python\system\*.py ..\..\..\..\test\python\system
xcopy /Y /E /I ..\..\..\..\Scripts\Python\system\*.pyd ..\..\..\..\test\python\system
REM xcopy /Y ..\..\..\..\..\StaticSDKs\Win32\EAX\lib\eax.dll ..\..\..\..\test\
REM xcopy /Y ..\..\..\..\..\StaticSDKs\Win32\Bink\lib\binkw32.dll ..\..\..\..\test\
xcopy /Y ..\..\..\..\..\StaticSDKs\Win32\EAX\lib\eax.dll ..\..\..\..\test\
xcopy /Y ..\..\..\..\..\StaticSDKs\Win32\PhysX\Bin\win32\NxCharacter.dll ..\..\..\..\test\
xcopy /Y ..\..\..\..\..\StaticSDKs\Win32\PhysX\Bin\win32\NxCooking.dll ..\..\..\..\test\
xcopy /Y ..\..\..\..\..\StaticSDKs\Win32\PhysX\Bin\win32\NxExtensions.dll ..\..\..\..\test\
@ -355,6 +353,9 @@ xcopy /Y ..\..\..\..\Sources\Plasma\Apps\plClient\external\resource.dat ..\..\..
<File
RelativePath="..\..\..\..\Sources\Plasma\Apps\plClient\plClientUpdateFormat.h">
</File>
<File
RelativePath="..\..\..\..\Sources\Plasma\Apps\PlClient\loginfix.h">
</File>
<File
RelativePath="..\..\..\..\Sources\Tools\MaxSceneViewer\plPluginClient.h">
</File>
@ -417,28 +418,6 @@ xcopy /Y ..\..\..\..\Sources\Plasma\Apps\plClient\external\resource.dat ..\..\..
Name="VCCustomBuildTool"/>
</FileConfiguration>
</File>
<Filter
Name="DX9"
Filter="">
<File
RelativePath="..\..\..\..\..\StaticSDKs\Win32\DX9.0c\Lib\x86\d3dx9.lib">
</File>
<File
RelativePath="..\..\..\..\..\StaticSDKs\Win32\DX9.0c\Lib\x86\dinput8.lib">
</File>
<File
RelativePath="..\..\..\..\..\StaticSDKs\Win32\DX9.0c\Lib\x86\dplayx.lib">
</File>
<File
RelativePath="..\..\..\..\..\StaticSDKs\Win32\DX9.0c\Lib\x86\dsound.lib">
</File>
<File
RelativePath="..\..\..\..\..\StaticSDKs\Win32\DX9.0c\Lib\x86\DxErr9.lib">
</File>
<File
RelativePath="..\..\..\..\..\StaticSDKs\Win32\DX9.0c\Lib\x86\dxguid.lib">
</File>
</Filter>
<Filter
Name="PhysX"
Filter="">

6
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/Apps/plClientPatcher/plClientPatcher.vcproj
View File

@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib;../../../../Sources/Plasma/PubUtilLib;../../../../Sources/Plasma/CoreLib;../../../../Sources/Plasma/NucleusLib/inc"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib;../../../../Sources/Plasma/PubUtilLib;../../../../Sources/Plasma/CoreLib;../../../../Sources/Plasma/NucleusLib/inc;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
StringPooling="TRUE"
MinimalRebuild="FALSE"
@ -104,7 +104,7 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib;../../../../Sources/Plasma/PubUtilLib;../../../../Sources/Plasma/CoreLib;../../../../Sources/Plasma/NucleusLib/inc"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib;../../../../Sources/Plasma/PubUtilLib;../../../../Sources/Plasma/CoreLib;../../../../Sources/Plasma/NucleusLib/inc;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
StringPooling="TRUE"
RuntimeLibrary="0"
@ -147,7 +147,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib;../../../../Sources/Plasma/PubUtilLib;../../../../Sources/Plasma/CoreLib;../../../../Sources/Plasma/NucleusLib/inc"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib;../../../../Sources/Plasma/PubUtilLib;../../../../Sources/Plasma/CoreLib;../../../../Sources/Plasma/NucleusLib/inc;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
StringPooling="TRUE"
MinimalRebuild="FALSE"

3
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/Apps/plFileSecure/plFileSecure.vcproj
View File

@ -103,11 +103,10 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="rpcrt4.lib CoreLib.lib CoreLibExe.lib plFile.lib plUnifiedTime.lib pnProduct.lib pnUtils.lib"
AdditionalDependencies="rpcrt4.lib"
OutputFile=".\Release/plFileSecure.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="../../NucleusLib/pnUtils/Release;../../NucleusLib/pnProduct/Release;../../CoreLibExe/Release;../../CoreLib/Release;../../PubUtilLib/plUnifiedTime/Release;../../PubUtilLib/plFile/Release"
ProgramDatabaseFile=".\Release/plFileSecure.pdb"
SubSystem="1"
TargetMachine="1"/>

8
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/Apps/plMD5/plMD5.vcproj
View File

@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib;../../../../Sources/Plasma/PubUtilLib;../../../../Sources/Plasma/CoreLib"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib;../../../../Sources/Plasma/PubUtilLib;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
StringPooling="TRUE"
MinimalRebuild="TRUE"
@ -35,7 +35,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Iphlpapi.lib rpcrt4.lib ws2_32.lib zlibd.lib winmm.lib libcrypto.a comctl32.lib"
AdditionalDependencies="Iphlpapi.lib rpcrt4.lib ws2_32.lib zlibd.lib winmm.lib libeay32.lib comctl32.lib"
OutputFile="$(OutDir)/plMD5.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="..\..\..\..\..\StaticSDKs\Win32\OpenSSL\lib;..\..\..\..\..\StaticSDKs\XPlatform\zlib\lib"
@ -72,7 +72,7 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib;../../../../Sources/Plasma/PubUtilLib;../../../../Sources/Plasma/CoreLib"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib;../../../../Sources/Plasma/PubUtilLib;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
StringPooling="TRUE"
ExceptionHandling="FALSE"
@ -86,7 +86,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Iphlpapi.lib rpcrt4.lib ws2_32.lib zlib.lib winmm.lib libcrypto.a comctl32.lib"
AdditionalDependencies="Iphlpapi.lib rpcrt4.lib ws2_32.lib zlib.lib winmm.lib libeay32.lib comctl32.lib"
OutputFile="$(OutDir)/plMD5.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="..\..\..\..\..\StaticSDKs\Win32\OpenSSL\lib;..\..\..\..\..\StaticSDKs\XPlatform\zlib\lib"

4
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/Apps/plPageInfo/plPageInfo.vcproj
View File

@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
StringPooling="TRUE"
RuntimeLibrary="2"
@ -84,7 +84,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"

10
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/Apps/plPageOptimizer/plPageOptimizer.vcproj
View File

@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../Sources/Plasma/CoreLib;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/FeatureLib/inc;&quot;../../../../SDKs/XPlatform/Cypython-2.3.3/Include&quot;;&quot;../../../../SDKs/XPlatform/Cypython-2.3.3/pyconfig_static&quot;;../../../../../StaticSDKs/Win32/dx9.0c/include"
AdditionalIncludeDirectories="../../../../Sources/Plasma/CoreLib;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/FeatureLib/inc;&quot;../../../../SDKs/XPlatform/Cypython-2.3.3/Include&quot;;&quot;../../../../SDKs/XPlatform/Cypython-2.3.3/pyconfig_static&quot;;../../../../../StaticSDKs/Win32/dx9.0c/include;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@ -33,10 +33,10 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisfile_static.lib ksproxy.lib strmiids.lib eax.lib wininet.lib vfw32.lib winmm.lib libcrypto.a ws2_32.lib version.lib odbc32.lib odbccp32.lib eaxguid.lib binkw32.lib d3dx9.lib dinput8.lib dplayx.lib dsound.lib dxerr9.lib dxguid.lib libpngd.lib zlibd.lib Rpcrt4.lib ijl15l.lib NxCharacter.lib PhysXLoader.lib libspeex.lib OpenAL32.lib"
AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisfile_static.lib ksproxy.lib strmiids.lib wininet.lib vfw32.lib winmm.lib libeay32.lib ws2_32.lib version.lib odbc32.lib odbccp32.lib d3dx9.lib dinput8.lib dplayx.lib dsound.lib dxerr9.lib dxguid.lib libpngd.lib zlibd.lib Rpcrt4.lib NxCharacter.lib PhysXLoader.lib libspeex.lib OpenAL32.lib libjpeg.lib"
OutputFile="$(OutDir)/plPageOptimizer.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="..\..\..\..\..\StaticSDKs\Win32\Bink\lib;..\..\..\..\..\StaticSDKs\Win32\eax\lib;..\..\..\..\..\StaticSDKs\Win32\oggvorbis\lib;..\..\..\..\..\STATICSDKS\Win32\ijl\lib;..\..\..\..\..\StaticSDKs\Win32\WMSDK\lib;..\..\..\..\..\StaticSDKs\Win32\OpenSSL\lib;..\..\..\..\..\StaticSDKs\Win32\dx8.1sdk\lib;..\..\..\..\SDKs\XPlatform\ODE\lib\win32;&quot;..\..\..\..\..\StaticSDKs\XPlatform\expat-1.95.7\StaticLibs&quot;;..\..\..\..\..\StaticSDKs\XPlatform\png\lib;..\..\..\..\..\StaticSDKs\XPlatform\zlib\lib;..\..\..\..\..\StaticSDKs\Win32\PhysX\lib\win32;&quot;..\..\..\..\..\StaticSDKs\XPlatform\expat-1.95.7\StaticLibs\Win32&quot;;&quot;..\..\..\..\..\StaticSDKs\Win32\speex-1.0.1\Win32\libspeex\Debug&quot;;&quot;..\..\..\..\..\StaticSDKs\Win32\OpenAL 1.1 with EFX SDK\libs\Win32&quot;;..\..\..\..\..\StaticSDKs\Win32\dx9.0c\lib"
AdditionalLibraryDirectories="..\..\..\..\..\StaticSDKs\Win32\eax\lib;..\..\..\..\..\StaticSDKs\Win32\oggvorbis\lib;..\..\..\..\..\StaticSDKs\Win32\WMSDK\lib;..\..\..\..\..\StaticSDKs\Win32\OpenSSL\lib;..\..\..\..\..\StaticSDKs\Win32\dx8.1sdk\lib;..\..\..\..\SDKs\XPlatform\ODE\lib\win32;&quot;..\..\..\..\..\StaticSDKs\XPlatform\expat-1.95.7\StaticLibs&quot;;..\..\..\..\..\StaticSDKs\XPlatform\png\lib;..\..\..\..\..\StaticSDKs\XPlatform\zlib\lib;..\..\..\..\..\StaticSDKs\Win32\PhysX\lib\win32;&quot;..\..\..\..\..\StaticSDKs\XPlatform\expat-1.95.7\StaticLibs\Win32&quot;;&quot;..\..\..\..\..\StaticSDKs\Win32\speex-1.0.1\Win32\libspeex\Debug&quot;;&quot;..\..\..\..\..\StaticSDKs\Win32\OpenAL 1.1 with EFX SDK\libs\Win32&quot;;..\..\..\..\..\StaticSDKs\Win32\dx9.0c\lib;..\..\..\..\..\StaticSDKs\Win32\dx9.0c\lib\x86;&quot;../../../../../StaticSDKs/XPlatform/jpeg-8c-rgba&quot;"
IgnoreDefaultLibraryNames="libc.lib,libcd.lib,libci.lib"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/plPageOptimizer.pdb"
@ -86,11 +86,11 @@
AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisfile_static.lib strmiids.lib wininet.lib vfw32.lib winmm.lib libeay32.lib ws2_32.lib version.lib odbc32.lib odbccp32.lib d3dx9.lib dinput8.lib dplayx.lib dsound.lib dxerr9.lib dxguid.lib libpng.lib zlib.lib libspeex.lib OpenAL32.lib Rpcrt4.lib NxCharacter.lib PhysXLoader.lib libjpeg.lib"
OutputFile="$(OutDir)/plPageOptimizer.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="..\..\..\..\..\StaticSDKs\Win32\Bink\lib;..\..\..\..\..\StaticSDKs\Win32\eax\lib;..\..\..\..\..\StaticSDKs\Win32\oggvorbis\lib;..\..\..\..\..\STATICSDKS\Win32\ijl\lib;..\..\..\..\..\StaticSDKs\Win32\WMSDK\lib;..\..\..\..\..\StaticSDKs\Win32\OpenSSL\lib;..\..\..\..\..\StaticSDKs\Win32\dx9.0c\lib\x86;..\..\..\..\SDKs\XPlatform\ODE\lib\win32;&quot;..\..\..\..\..\StaticSDKs\XPlatform\expat-1.95.7\StaticLibs&quot;;..\..\..\..\..\StaticSDKs\XPlatform\png\lib;..\..\..\..\..\StaticSDKs\XPlatform\zlib\lib;&quot;..\..\..\..\..\StaticSDKs\Win32\speex-1.0.1\Win32\libspeex\Release&quot;;&quot;..\..\..\..\..\StaticSDKs\Win32\OpenAL 1.1 with EFX SDK\libs\Win32&quot;;&quot;..\..\..\..\..\StaticSDKs\XPlatform\expat-1.95.7\StaticLibs\Win32&quot;;..\..\..\..\..\StaticSDKs\Win32\PhysX\lib\win32;&quot;../../../../../StaticSDKs/XPlatform/jpeg-8c-rgba&quot;"
AdditionalLibraryDirectories="..\..\..\..\..\StaticSDKs\Win32\eax\lib;..\..\..\..\..\StaticSDKs\Win32\oggvorbis\lib;..\..\..\..\..\StaticSDKs\Win32\WMSDK\lib;..\..\..\..\..\StaticSDKs\Win32\OpenSSL\lib;..\..\..\..\..\StaticSDKs\Win32\dx9.0c\lib;..\..\..\..\..\StaticSDKs\Win32\dx9.0c\lib\x86;..\..\..\..\SDKs\XPlatform\ODE\lib\win32;&quot;..\..\..\..\..\StaticSDKs\XPlatform\expat-1.95.7\StaticLibs&quot;;..\..\..\..\..\StaticSDKs\XPlatform\png\lib;..\..\..\..\..\StaticSDKs\XPlatform\zlib\lib;&quot;..\..\..\..\..\StaticSDKs\Win32\speex-1.0.1\Win32\libspeex\Release&quot;;&quot;..\..\..\..\..\StaticSDKs\Win32\OpenAL 1.1 with EFX SDK\libs\Win32&quot;;&quot;..\..\..\..\..\StaticSDKs\XPlatform\expat-1.95.7\StaticLibs\Win32&quot;;..\..\..\..\..\StaticSDKs\Win32\PhysX\lib\win32;&quot;../../../../../StaticSDKs/XPlatform/jpeg-8c-rgba&quot;"
IgnoreDefaultLibraryNames="libc.lib,libci.lib,libcmt.lib"
GenerateDebugInformation="TRUE"
SubSystem="1"
OptimizeReferences="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"/>
<Tool

10
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/Apps/plPlasmaInstaller/plPlasmaInstaller.vcproj
View File

@ -39,11 +39,11 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="zlib.lib comctl32.lib odbc32.lib odbccp32.lib"
AdditionalDependencies="zlib.lib comctl32.lib odbc32.lib odbccp32.lib libeay32.lib rpcrt4.lib ws2_32.lib"
OutputFile="Release/PlasmaInstaller.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\..\..\StaticSDKs\XPlatform\zlib\lib"
AdditionalLibraryDirectories="..\..\..\..\..\StaticSDKs\XPlatform\zlib\lib;..\..\..\..\..\StaticSDKs\Win32\OpenSSL\lib"
ProgramDatabaseFile=".\Release/PlasmaInstaller.pdb"
SubSystem="2"
TargetMachine="1"/>
@ -153,6 +153,9 @@
<Filter
Name="Source Files"
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
<File
RelativePath="..\..\..\..\..\StaticSDKs\XPlatform\zlib\contrib\minizip\ioapi.c">
</File>
<File
RelativePath="..\..\..\..\Sources\Plasma\Apps\plPlasmaInstaller\main.cpp">
<FileConfiguration
@ -277,6 +280,9 @@
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl">
<File
RelativePath="..\..\..\..\..\StaticSDKs\XPlatform\zlib\contrib\minizip\ioapi.h">
</File>
<File
RelativePath="..\..\..\..\Sources\Plasma\Apps\plPlasmaInstaller\plInstallerReg.h">
</File>

8
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/Apps/plPlasmaUpdate/plPlasmaUpdate.vcproj
View File

@ -21,7 +21,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\Sources\Plasma\CoreLib;..\..\..\..\Sources\Plasma\NucleusLib\inc;..\..\..\..\Sources\Plasma\PubUtilLib\inc;..\..\..\..\..\StaticSDKs\XPlatform\zlib;..\..\..\..\Sources\AssetMan\Libs\jvCoreUtil;..\..\..\..\Sources\Plasma\PubUtilLib\plHttpServer"
AdditionalIncludeDirectories="..\..\..\..\Sources\Plasma\CoreLib;..\..\..\..\Sources\Plasma\NucleusLib\inc;..\..\..\..\Sources\Plasma\PubUtilLib\inc;..\..\..\..\..\StaticSDKs\XPlatform\zlib;..\..\..\..\Sources\AssetMan\Libs\jvCoreUtil;..\..\..\..\Sources\Plasma\PubUtilLib\plHttpServer;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@ -38,7 +38,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ogg_static_d.lib vorbis_static_d.lib vorbisfile_static_d.lib winmm.lib zlib.lib libcrypto.a dxerr8.lib comctl32.lib odbc32.lib odbccp32.lib wininet.lib Rpcrt4.lib"
AdditionalDependencies="ogg_static_d.lib vorbis_static_d.lib vorbisfile_static_d.lib winmm.lib zlib.lib libeay32.lib dxerr8.lib comctl32.lib odbc32.lib odbccp32.lib wininet.lib Rpcrt4.lib"
OutputFile="Debug/ParableUpdate.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
@ -89,7 +89,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\..\..\Sources\Plasma\CoreLib;..\..\..\..\Sources\Plasma\NucleusLib\inc;..\..\..\..\Sources\Plasma\PubUtilLib\inc;..\..\..\..\..\StaticSDKs\XPlatform\zlib;..\..\..\..\Sources\AssetMan\Libs\jvCoreUtil;..\..\..\..\Sources\Plasma\PubUtilLib\plHttpServer"
AdditionalIncludeDirectories="..\..\..\..\Sources\Plasma\CoreLib;..\..\..\..\Sources\Plasma\NucleusLib\inc;..\..\..\..\Sources\Plasma\PubUtilLib\inc;..\..\..\..\..\StaticSDKs\XPlatform\zlib;..\..\..\..\Sources\AssetMan\Libs\jvCoreUtil;..\..\..\..\Sources\Plasma\PubUtilLib\plHttpServer;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
StringPooling="TRUE"
RuntimeLibrary="2"
@ -106,7 +106,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisfile_static.lib winmm.lib zlib.lib libcrypto.a dxerr8.lib comctl32.lib odbc32.lib odbccp32.lib wininet.lib Rpcrt4.lib"
AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisfile_static.lib winmm.lib zlib.lib libeay32.lib dxerr8.lib comctl32.lib odbc32.lib odbccp32.lib wininet.lib Rpcrt4.lib"
OutputFile="Release/ParableUpdate.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"

32
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/Apps/plUruLauncher/plUruLauncher.vcproj
View File

@ -20,7 +20,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib;../../../../Sources/Plasma/PubUtilLib;../../../../Sources/Plasma/CoreLib;../../../../Sources/Plasma/NucleusLib/inc"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib;../../../../Sources/Plasma/PubUtilLib;../../../../Sources/Plasma/CoreLib;../../../../Sources/Plasma/NucleusLib/inc;../../../../../StaticSDKs/Win32/PlatformSDK/Include;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
StringPooling="TRUE"
MinimalRebuild="FALSE"
@ -35,7 +35,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Iphlpapi.lib rpcrt4.lib ws2_32.lib zlibd.lib winmm.lib libcrypto.a comctl32.lib"
AdditionalDependencies="winhttp.lib Iphlpapi.lib rpcrt4.lib ws2_32.lib zlibd.lib winmm.lib libeay32.lib comctl32.lib ogg_static_d.lib vorbis_static_d.lib vorbisfile_static_d.lib"
OutputFile="$(OutDir)/UruLauncher.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="..\..\..\..\..\StaticSDKs\Win32\OpenSSL\lib;;..\..\..\..\..\StaticSDKs\XPlatform\zlib\lib"
@ -66,22 +66,19 @@
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory=".\Release"
IntermediateDirectory=".\Release"
OutputDirectory="Release"
IntermediateDirectory="Release"
ConfigurationType="1"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib;../../../../Sources/Plasma/PubUtilLib;../../../../Sources/Plasma/CoreLib;../../../../Sources/Plasma/NucleusLib/inc;../../../../../StaticSDKs/Win32/PlatformSDK/Include;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
StringPooling="TRUE"
RuntimeLibrary="2"
BufferSecurityCheck="FALSE"
UsePrecompiledHeader="0"
PrecompiledHeaderThrough=""
ObjectFile=".\Release/"
ProgramDataBaseFileName=".\Release/"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="Pch.h"
WarningLevel="3"
Detect64BitPortabilityProblems="FALSE"
DebugInformationFormat="3"/>
@ -89,16 +86,15 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Iphlpapi.lib rpcrt4.lib ws2_32.lib zlib.lib winmm.lib libeay32.lib winhttp.lib comctl32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib"
OutputFile=".\Release/UruLauncher.exe"
AdditionalDependencies="winhttp.lib Iphlpapi.lib rpcrt4.lib ws2_32.lib zlib.lib winmm.lib libeay32.lib comctl32.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib"
OutputFile="$(OutDir)/UruLauncher.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="..\..\..\..\..\StaticSDKs\Win32\OpenSSL\lib;..\..\..\..\..\StaticSDKs\XPlatform\zlib\lib;..\..\..\..\..\StaticSDKs\Win32\PlatformSDK\Lib;..\..\..\..\..\StaticSDKs\Win32\oggvorbis\lib"
IgnoreDefaultLibraryNames="libc.lib,libci.lib,libcmt.lib"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\Release\plUruLauncher.pdb"
SubSystem="2"
OptimizeReferences="1"
EnableCOMDATFolding="0"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"/>
@ -131,7 +127,7 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib;../../../../Sources/Plasma/PubUtilLib;../../../../Sources/Plasma/CoreLib;../../../../Sources/Plasma/NucleusLib/inc;../../../../../StaticSDKs/Win32/PlatformSDK/Include"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib;../../../../Sources/Plasma/PubUtilLib;../../../../Sources/Plasma/CoreLib;../../../../Sources/Plasma/NucleusLib/inc;../../../../../StaticSDKs/Win32/PlatformSDK/Include;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
StringPooling="TRUE"
RuntimeLibrary="0"
@ -145,7 +141,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="winhttp.lib Iphlpapi.lib rpcrt4.lib ws2_32.lib zlib_srv.lib winmm.lib libcrypto.a comctl32.lib libogg.lib libvorbis.lib libvorbisfile.lib"
AdditionalDependencies="winhttp.lib Iphlpapi.lib rpcrt4.lib ws2_32.lib zlib_srv.lib winmm.lib libeay32.lib comctl32.lib libogg.lib libvorbis.lib libvorbisfile.lib"
OutputFile="$(OutDir)/UruLauncher.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="..\..\..\..\..\StaticSDKs\Win32\OpenSSL\lib;..\..\..\..\..\StaticSDKs\XPlatform\zlib\lib;..\..\..\..\..\StaticSDKs\Win32\oggvorbis\lib;..\..\..\..\..\StaticSDKs\Win32\PlatformSDK\Lib"
@ -185,7 +181,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib;../../../../Sources/Plasma/PubUtilLib;../../../../Sources/Plasma/CoreLib;../../../../Sources/Plasma/NucleusLib/inc;../../../../../StaticSDKs/Win32/PlatformSDK/Include"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib;../../../../Sources/Plasma/PubUtilLib;../../../../Sources/Plasma/CoreLib;../../../../Sources/Plasma/NucleusLib/inc;../../../../../StaticSDKs/Win32/PlatformSDK/Include;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
StringPooling="TRUE"
MinimalRebuild="FALSE"
@ -200,7 +196,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="winhttp.lib Iphlpapi.lib rpcrt4.lib ws2_32.lib zlibd_srv.lib winmm.lib libcrypto.a comctl32.lib libogg_d.lib libvorbis_d.lib libvorbisfile_d.lib"
AdditionalDependencies="winhttp.lib Iphlpapi.lib rpcrt4.lib ws2_32.lib zlibd_srv.lib winmm.lib libeay32.lib comctl32.lib libogg_d.lib libvorbis_d.lib libvorbisfile_d.lib"
OutputFile="$(OutDir)/UruLauncher.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="..\..\..\..\..\StaticSDKs\Win32\OpenSSL\lib;..\..\..\..\..\StaticSDKs\XPlatform\zlib\lib;..\..\..\..\..\StaticSDKs\Win32\oggvorbis\lib;..\..\..\..\..\StaticSDKs\Win32\PlatformSDK\Lib"

2
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/FeatureLib/pfAnimation/pfAnimation.vcproj
View File

@ -74,7 +74,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../Sources/Plasma/FeatureLib/inc;../../../../sdks/win32/havok/include;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib"
AdditionalIncludeDirectories="../../../../Sources/Plasma/FeatureLib/inc;../../../../sdks/win32/havok/include;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="_DEBUG;WIN32;_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="3"

2
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/FeatureLib/pfAudio/pfAudio.vcproj
View File

@ -74,7 +74,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc,../../../../../StaticSDKs/XPlatform/STLport/stlport,../../../../Sources/Plasma/PubUtilLib/inc,../../../../Sources/Plasma/CoreLib"
AdditionalIncludeDirectories="../../../../Sources/Plasma/PubUtilLib;../../../../Sources/Plasma/FeatureLib;../../../../Sources/Plasma/NucleusLib;../../../../Sources/Plasma/NucleusLib/inc;../../../../../StaticSDKs/XPlatform/STLport/stlport;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="3"

2
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/FeatureLib/pfCamera/pfCamera.vcproj
View File

@ -21,7 +21,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../Sources/Plasma/FeatureLib/inc;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib"
AdditionalIncludeDirectories="../../../../Sources/Plasma/FeatureLib/inc;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="3"

2
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/FeatureLib/pfCharacter/pfCharacter.vcproj
View File

@ -21,7 +21,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../Sources/Plasma/FeatureLib/inc;../../../../sdks/win32/havok/include;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib"
AdditionalIncludeDirectories="../../../../Sources/Plasma/FeatureLib/inc;../../../../sdks/win32/havok/include;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="_DEBUG;WIN32;_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="3"

2
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/FeatureLib/pfConsole/pfConsole.vcproj
View File

@ -74,7 +74,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../Sources/Plasma/FeatureLib/inc;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;&quot;../../../../SDKs/XPlatform/Cypython-2.3.3/Include&quot;;&quot;../../../../SDKs/XPlatform/Cypython-2.3.3/PC&quot;;../../../../SDKs/XPlatform/Cypython-2.3.3/pyconfig_static"
AdditionalIncludeDirectories="../../../../Sources/Plasma/FeatureLib/inc;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;&quot;../../../../SDKs/XPlatform/Cypython-2.3.3/Include&quot;;&quot;../../../../SDKs/XPlatform/Cypython-2.3.3/PC&quot;;&quot;../../../../SDKs/XPlatform/Cypython-2.3.3/pyconfig_static&quot;;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="3"

2
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/FeatureLib/pfGameMgr/pfGameMgr.vcproj
View File

@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../Sources/Plasma/FeatureLib/inc;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib"
AdditionalIncludeDirectories="../../../../Sources/Plasma/FeatureLib/inc;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
StringPooling="TRUE"
MinimalRebuild="TRUE"

2
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/FeatureLib/pfJournalBook/pfJournalBook.vcproj
View File

@ -21,7 +21,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../Sources/Plasma/FeatureLib/inc;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib"
AdditionalIncludeDirectories="../../../../Sources/Plasma/FeatureLib/inc;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="3"

2
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/FeatureLib/pfPython/pfPython.vcproj
View File

@ -78,7 +78,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/Zm1000 "
Optimization="0"
AdditionalIncludeDirectories="../../../../Sources/Plasma/FeatureLib/inc;../../../../Sources/Plasma/Apps/plClient;&quot;../../../../SDKs/XPlatform/Cypython-2.3.3/Include&quot;;&quot;../../../../SDKs/XPlatform/Cypython-2.3.3/PC&quot;;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/dx8.1sdk/include;../../../../../StaticSDKs/Win32/Bink/inc;&quot;../../../../SDKs/XPlatform/Cypython-2.3.3/pyconfig_static&quot;"
AdditionalIncludeDirectories="../../../../Sources/Plasma/FeatureLib/inc;../../../../Sources/Plasma/Apps/plClient;&quot;../../../../SDKs/XPlatform/Cypython-2.3.3/Include&quot;;&quot;../../../../SDKs/XPlatform/Cypython-2.3.3/PC&quot;;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/dx8.1sdk/include;../../../../../StaticSDKs/Win32/Bink/inc;&quot;../../../../SDKs/XPlatform/Cypython-2.3.3/pyconfig_static&quot;;&quot;../../../../../StaticSDKs/Win32/OpenAL 1.1 with EFX SDK/include&quot;;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="_DEBUG;WIN32;_LIB;MS_NO_COREDLL"
BasicRuntimeChecks="3"
RuntimeLibrary="3"

24
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/FeatureLib/pfSurface/pfSurface.vcproj
View File

@ -21,7 +21,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../Sources/Plasma/FeatureLib/inc;../../../../Sources/Plasma/NucleusLib/inc;../../../../../StaticSDKs/Win32/Bink/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib"
AdditionalIncludeDirectories="../../../../Sources/Plasma/FeatureLib/inc;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@ -73,7 +73,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../../../../Sources/Plasma/FeatureLib/inc;../../../../Sources/Plasma/NucleusLib/inc;../../../../../StaticSDKs/Win32/Bink/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib"
AdditionalIncludeDirectories="../../../../Sources/Plasma/FeatureLib/inc;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
StringPooling="TRUE"
RuntimeLibrary="2"
@ -221,26 +221,6 @@
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\..\Sources\Plasma\FeatureLib\pfSurface\plLayerBink.cpp">
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\..\Sources\Plasma\FeatureLib\pfSurface\plLayerMovie.cpp">
<FileConfiguration

6
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/PubUtilLib/plAgeDescription/plAgeDescription.vcproj
View File

@ -22,7 +22,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/FeatureLib/inc;../../../../Sources/Plasma/CoreLib"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/FeatureLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@ -126,7 +126,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/FeatureLib/inc;../../../../Sources/Plasma/CoreLib"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/FeatureLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@ -178,7 +178,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/FeatureLib/inc;../../../../Sources/Plasma/CoreLib"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/FeatureLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
StringPooling="TRUE"
RuntimeLibrary="0"

2
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/PubUtilLib/plAgeLoader/plAgeLoader.vcproj
View File

@ -74,7 +74,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/FeatureLib/inc;../../../../Sources/Plasma/CoreLib"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/FeatureLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="3"

4
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/PubUtilLib/plAudible/plAudible.vcproj
View File

@ -21,7 +21,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@ -73,7 +73,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;&quot;../../../../../StaticSDKs/Win32/OpenAL 1.1 with EFX SDK/include&quot;"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;&quot;../../../../../StaticSDKs/Win32/OpenAL 1.1 with EFX SDK/include&quot;;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
StringPooling="TRUE"
RuntimeLibrary="2"

4
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/PubUtilLib/plAudio/plAudio.vcproj
View File

@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../../StaticSDKs/Win32/dx9.0c/include;../../../../SDKs/Win32/HawkVoice/src;../../../../SDKs/Win32/HawkVoice/Release;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/WMSDK/include;../../../../../StaticSDKs/Win32/EAX/include;../../../../../StaticSDKs/Win32/oggvorbis/include;&quot;../../../../../StaticSDKs/Win32/speex-1.0.1/libspeex&quot;;../../../../../StaticSDKs/Win32/OpenAL 1.1 with EFX SDK/include"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../../StaticSDKs/Win32/dx9.0c/include;../../../../SDKs/Win32/HawkVoice/src;../../../../SDKs/Win32/HawkVoice/Release;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/WMSDK/include;../../../../../StaticSDKs/Win32/EAX/include;../../../../../StaticSDKs/Win32/oggvorbis/include;&quot;../../../../../StaticSDKs/Win32/speex-1.0.1/libspeex&quot;;&quot;../../../../../StaticSDKs/Win32/OpenAL 1.1 with EFX SDK/include&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
StringPooling="TRUE"
RuntimeLibrary="2"
@ -74,7 +74,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../../StaticSDKs/Win32/dx9.0c/include;../../../../SDKs/Win32/HawkVoice/src;../../../../SDKs/Win32/HawkVoice/Release;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/WMSDK/include;../../../../../StaticSDKs/Win32/EAX/include;../../../../../StaticSDKs/Win32/oggvorbis/include;&quot;../../../../../StaticSDKs/Win32/speex-1.0.1/libspeex&quot;;../../../../../StaticSDKs/Win32/OpenAL 1.1 with EFX SDK/include"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../../StaticSDKs/Win32/dx9.0c/include;../../../../SDKs/Win32/HawkVoice/src;../../../../SDKs/Win32/HawkVoice/Release;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/WMSDK/include;../../../../../StaticSDKs/Win32/EAX/include;../../../../../StaticSDKs/Win32/oggvorbis/include;&quot;../../../../../StaticSDKs/Win32/speex-1.0.1/libspeex&quot;;&quot;../../../../../StaticSDKs/Win32/OpenAL 1.1 with EFX SDK/include&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="3"

48
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/PubUtilLib/plAvatar/plAvatar.vcproj
View File

@ -22,7 +22,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/FeatureLib/inc;../../../../sdks/win32/havok/include;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/FeatureLib/inc;../../../../sdks/win32/havok/include;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="_DEBUG;WIN32;_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@ -282,26 +282,6 @@
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\..\Sources\Plasma\PubUtilLib\plAvatar\plAntiGravAction.cpp">
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\..\Sources\Plasma\PubUtilLib\plAvatar\plArmatureEffects.cpp">
<FileConfiguration
@ -588,26 +568,6 @@
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\..\Sources\Plasma\PubUtilLib\plAvatar\plAvCallbackAction.cpp">
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\..\Sources\Plasma\PubUtilLib\plAvatar\plAvLadderModifier.cpp">
<FileConfiguration
@ -939,9 +899,6 @@
<File
RelativePath="..\..\..\..\Sources\Plasma\PubUtilLib\plAvatar\plAnimStage.h">
</File>
<File
RelativePath="..\..\..\..\Sources\Plasma\PubUtilLib\plAvatar\plAntiGravAction.h">
</File>
<File
RelativePath="..\..\..\..\Sources\Plasma\PubUtilLib\plAvatar\plArmatureEffects.h">
</File>
@ -993,9 +950,6 @@
<File
RelativePath="..\..\..\..\Sources\Plasma\PubUtilLib\plAvatar\plAvBrainSwim.h">
</File>
<File
RelativePath="..\..\..\..\Sources\Plasma\PubUtilLib\plAvatar\plAvCallbackAction.h">
</File>
<File
RelativePath="..\..\..\..\Sources\Plasma\PubUtilLib\plAvatar\plAvDefs.h">
</File>

10
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/PubUtilLib/plEncryption/plEncryption.vcproj
View File

@ -75,7 +75,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@ -177,7 +177,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;SERVER"
StringPooling="TRUE"
BasicRuntimeChecks="3"
@ -231,7 +231,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;SERVER"
StringPooling="TRUE"
RuntimeLibrary="0"
@ -285,7 +285,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
StringPooling="TRUE"
RuntimeLibrary="0"
@ -336,7 +336,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="1"

4
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/PubUtilLib/plGImage/plGImage.vcproj
View File

@ -22,7 +22,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../../StaticSDKs/Win32/dx8.1sdk/include;../../../../../StaticSDKs/XPlatform/zlib;../../../../../StaticSDKs/XPlatform/png;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../../StaticSDKs/Win32/DX9.0c/include;../../../../../StaticSDKs/XPlatform/zlib;../../../../../StaticSDKs/XPlatform/png;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
StringPooling="TRUE"
RuntimeLibrary="2"
@ -74,7 +74,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../../StaticSDKs/Win32/dx8.1sdk/include;../../../../../StaticSDKs/XPlatform/zlib;../../../../../StaticSDKs/XPlatform/png;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../../StaticSDKs/Win32/DX9.0c/include;../../../../../StaticSDKs/XPlatform/zlib;../../../../../StaticSDKs/XPlatform/png;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="3"

2
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/PubUtilLib/plGLight/plGLight.vcproj
View File

@ -74,7 +74,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="3"

2
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/PubUtilLib/plInputCore/plInputCore.vcproj
View File

@ -21,7 +21,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../../StaticSDKs/Win32/dx8.1sdk/include;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../../StaticSDKs/Win32/dx8.1sdk/include;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="3"

2
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/PubUtilLib/plJPEG/plJPEG.vcproj
View File

@ -21,7 +21,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib"
AdditionalIncludeDirectories="../../../../../StaticSDKs/XPlatform/jpeg-8c-rgba;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="3"

2
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/PubUtilLib/plModifier/plModifier.vcproj
View File

@ -21,7 +21,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/PhysX/Foundation/include"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/PhysX/Foundation/include;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="3"

2
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/PubUtilLib/plNetClient/PlNetClient.vcproj
View File

@ -21,7 +21,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc,../../../../../StaticSDKs/XPlatform/STLport/stlport,../../../../Sources/Plasma/PubUtilLib/inc,../../../../Sources/Plasma/CoreLib"
AdditionalIncludeDirectories="../../../../Sources/Plasma/PubUtilLib/PlNetCore;../../../../Sources/Plasma/PubUtilLib/PlFile;../../../../Sources/Plasma/PubUtilLib/PlRegistry;../../../../Sources/Plasma/NucleusLib/inc;../../../../../StaticSDKs/XPlatform/STLport/stlport;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="3"

2
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.vcproj
View File

@ -21,7 +21,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="3"

2
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/PubUtilLib/plNetTransport/plNetTransport.vcproj
View File

@ -21,7 +21,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="3"

2
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/PubUtilLib/plPhysX/plPhysX.vcproj
View File

@ -19,7 +19,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../Sources/Plasma/CoreLib;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../../StaticSDKs/Win32/PhysX/Physics/include;../../../../../StaticSDKs/Win32/PhysX/PhysXLoader/include;../../../../../StaticSDKs/Win32/PhysX/Cooking/include;../../../../../StaticSDKs/Win32/PhysX/Foundation/include;../../../../../StaticSDKs/Win32/PhysX/NxCharacter/include"
AdditionalIncludeDirectories="../../../../Sources/Plasma/CoreLib;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../../StaticSDKs/Win32/PhysX/Physics/include;../../../../../StaticSDKs/Win32/PhysX/PhysXLoader/include;../../../../../StaticSDKs/Win32/PhysX/Cooking/include;../../../../../StaticSDKs/Win32/PhysX/Foundation/include;../../../../../StaticSDKs/Win32/PhysX/NxCharacter/include;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
MinimalRebuild="FALSE"
BasicRuntimeChecks="3"

4
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/PubUtilLib/plPhysical/plPhysical.vcproj
View File

@ -21,7 +21,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../sdks/win32/havok/include;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../sdks/win32/havok/include;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="_DEBUG;WIN32;_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@ -73,7 +73,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../sdks/win32/havok/include;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;&quot;../../../../../StaticSDKs/Win32/OpenAL 1.1 with EFX SDK/include&quot;"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../sdks/win32/havok/include;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;&quot;../../../../../StaticSDKs/Win32/OpenAL 1.1 with EFX SDK/include&quot;;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="NDEBUG;WIN32;_LIB"
StringPooling="TRUE"
RuntimeLibrary="2"

24
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/PubUtilLib/plPipeline/plPipeline.vcproj
View File

@ -21,7 +21,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../../StaticSDKs/Win32/dx9.0c/include;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/Bink/inc;../../../../Sources/Plasma/FeatureLib/inc"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../../StaticSDKs/Win32/dx9.0c/include;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../Sources/Plasma/FeatureLib/inc"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@ -73,7 +73,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../../StaticSDKs/Win32/dx9.0c/include;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/Bink/inc;../../../../Sources/Plasma/FeatureLib/inc"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../../StaticSDKs/Win32/dx9.0c/include;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../Sources/Plasma/FeatureLib/inc"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
StringPooling="TRUE"
RuntimeLibrary="2"
@ -181,26 +181,6 @@
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\..\Sources\Plasma\PubUtilLib\plPipeline\plBinkPlayer.cpp">
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\..\Sources\Plasma\PubUtilLib\plPipeline\plCaptureRender.cpp">
<FileConfiguration

46
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/FeatureLib/pfCCR/pfCCR.vcproj → MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/PubUtilLib/plPluginJPEG/plPluginJPEG.vcproj
View File

@ -2,8 +2,8 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="7.10"
Name="pfCCR"
ProjectGUID="{1599855E-CC20-4C3A-A382-5290C40BE08E}"
Name="plPluginJPEG"
ProjectGUID="{FEB4D52D-8D4E-4520-A490-ADE06159B650}"
SccProjectName=""
SccLocalPath="">
<Platforms>
@ -22,8 +22,8 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../Sources/Plasma/FeatureLib/inc;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../Sources/Plasma/PythonLib/Cypython/Include;../../../../Sources/Plasma/PythonLib/Cypython/PC"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
AdditionalIncludeDirectories="../../../../../StaticSDKs/XPlatform/jpeg-8c-rgba;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;IJL_SDK_AVAILABLE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
ForceConformanceInForLoopScope="TRUE"
@ -39,7 +39,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
OutputFile=".\Debug\pfCCR.lib"
OutputFile=".\Debug\plPluginJPEG.lib"
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"/>
@ -74,8 +74,8 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../../../../Sources/Plasma/FeatureLib/inc;../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../Sources/Plasma/PythonLib/Cypython/Include;../../../../Sources/Plasma/PythonLib/Cypython/PC"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;&quot;../../../../../StaticSDKs/XPlatform/jpeg-8c-rgba&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;IJL_SDK_AVAILABLE"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
@ -92,7 +92,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
OutputFile=".\Release\pfCCR.lib"
OutputFile=".\Release\plPluginJPEG.lib"
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"/>
@ -123,27 +123,7 @@
Name="Source Files"
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
<File
RelativePath="..\..\..\..\Sources\Plasma\FeatureLib\pfCCR\plCCRMgr.cpp">
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\..\Sources\Plasma\FeatureLib\pfCCR\plCCRVault.cpp">
RelativePath="..\..\..\..\Sources\Plasma\PubUtilLib\plJPEG\plJPEG.cpp">
<FileConfiguration
Name="Debug|Win32">
<Tool
@ -167,13 +147,7 @@
Name="Header Files"
Filter="h;hpp;hxx;hm;inl">
<File
RelativePath="..\..\..\..\Sources\Plasma\FeatureLib\pfCCR\plCCRCreatable.h">
</File>
<File
RelativePath="..\..\..\..\Sources\Plasma\FeatureLib\pfCCR\plCCRMgr.h">
</File>
<File
RelativePath="..\..\..\..\Sources\Plasma\FeatureLib\pfCCR\plCCRVault.h">
RelativePath="..\..\..\..\Sources\Plasma\PubUtilLib\plJPEG\plJPEG.h">
</File>
</Filter>
</Files>

2
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Plasma/PubUtilLib/plStatGather/plStatGather.vcproj
View File

@ -21,7 +21,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib"
AdditionalIncludeDirectories="../../../../Sources/Plasma/NucleusLib/inc;../../../../Sources/Plasma/PubUtilLib/inc;../../../../Sources/Plasma/CoreLib;../../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
BasicRuntimeChecks="3"
RuntimeLibrary="3"

34
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Tools/MaxMain/MaxMain.vcproj
View File

@ -21,7 +21,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="&quot;../../../SDKs/XPlatform/Cypython-2.3.3/pyconfig_static&quot;;&quot;../../../SDKs/XPlatform/Cypython-2.3.3/Include&quot;;&quot;../../../SDKs/XPlatform/Cypython-2.3.3/PC&quot;;..\..\..\sdks\win32\hawkvoice\lib;..\..\..\..\StaticSDKs\win32\max7sdk\include;../../../Sources/Plasma/NucleusLib/inc;..\..\..\Sources\Plasma\FeatureLib\inc;..\..\..\Sources\Plasma\PubUtilLib\inc;..\..\..\Sources\Plasma\CoreLib;../../../Sources/Tools/MaxAss;../../../../StaticSDKs/XPlatform/STLport/stlport;../../../../StaticSDKs/Win32/dx9.0c/include;../../../../StaticSDKs/Win32/PhysX/Physics/include;../../../../StaticSDKs/Win32/PhysX/PhysXLoader/include;../../../../StaticSDKs/Win32/PhysX/Cooking/include;../../../../StaticSDKs/Win32/PhysX/Foundation/include;../../../../StaticSDKs/Win32/PhysX/NxCharacter/include"
AdditionalIncludeDirectories="&quot;../../../SDKs/XPlatform/Cypython-2.3.3/pyconfig_static&quot;;&quot;../../../SDKs/XPlatform/Cypython-2.3.3/Include&quot;;&quot;../../../SDKs/XPlatform/Cypython-2.3.3/PC&quot;;..\..\..\sdks\win32\hawkvoice\lib;..\..\..\..\StaticSDKs\win32\max7sdk\include;../../../Sources/Plasma/NucleusLib/inc;..\..\..\Sources\Plasma\FeatureLib\inc;..\..\..\Sources\Plasma\PubUtilLib\inc;..\..\..\Sources\Plasma\CoreLib;../../../Sources/Tools/MaxAss;../../../../StaticSDKs/XPlatform/STLport/stlport;../../../../StaticSDKs/Win32/dx9.0c/include;../../../../StaticSDKs/Win32/PhysX/Physics/include;../../../../StaticSDKs/Win32/PhysX/PhysXLoader/include;../../../../StaticSDKs/Win32/PhysX/Cooking/include;../../../../StaticSDKs/Win32/PhysX/Foundation/include;../../../../StaticSDKs/Win32/PhysX/NxCharacter/include;../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;MAXPLUGINCODE;MS_NO_COREDLL"
StringPooling="TRUE"
RuntimeLibrary="2"
@ -39,11 +39,11 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Iphlpapi.lib oldnames.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib strmiids.lib libcrypto.a comsupp.lib binkw32.lib comctl32.lib winmm.lib vfw32.lib ws2_32.lib wininet.lib shlwapi.lib odbc32.lib odbccp32.lib wmstub.lib wmvcore.lib ijl15l.lib eaxguid.lib bmm.lib core.lib geom.lib gfx.lib mesh.lib maxutil.lib maxscrpt.lib manipsys.lib paramblk2.lib gup.lib libspeex.lib eax.lib Rpcrt4.lib largeint.lib OpenAL32.lib"
AdditionalDependencies="Iphlpapi.lib oldnames.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib strmiids.lib libeay32.lib comsupp.lib comctl32.lib winmm.lib vfw32.lib ws2_32.lib wininet.lib shlwapi.lib odbc32.lib odbccp32.lib d3dx9.lib dinput8.lib dsound.lib DxErr9.lib dxguid.lib wmstub.lib wmvcore.lib ijl15l.lib bmm.lib core.lib geom.lib gfx.lib mesh.lib maxutil.lib maxscrpt.lib manipsys.lib paramblk2.lib gup.lib libspeex.lib Rpcrt4.lib largeint.lib OpenAL32.lib libpngd.lib binkw32.lib"
OutputFile="Release/PlasmaMax.gup"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="&quot;..\..\..\..\StaticSDKs\XPlatform\expat-1.95.7\StaticLibs\Win32&quot;;..\..\..\..\StaticSDKs\Win32\OpenSSL\lib;..\..\..\..\STATICSDKS\XPLATFORM\STLPORT\lib;..\..\..\..\StaticSDKs\Win32\WMSDK\lib;..\..\..\..\STATICSDKS\Win32\ijl\lib;..\..\..\..\StaticSDKs\Win32\eax\lib;..\..\..\..\StaticSDKs\win32\max7sdk\lib;..\..\..\..\StaticSDKs\Win32\oggvorbis\lib;&quot;..\..\..\..\StaticSDKs\Win32\speex-1.0.1\Win32\libspeex\Release&quot;;..\..\..\..\StaticSDKs\Win32\Bink\lib;..\..\..\..\StaticSDKs\Win32\dx8.1sdk\lib;..\..\..\..\StaticSDKs\Win32\OpenAL 1.1 with EFX SDK\libs\Win32"
AdditionalLibraryDirectories="&quot;..\..\..\..\StaticSDKs\XPlatform\expat-1.95.7\StaticLibs\Win32&quot;;..\..\..\..\StaticSDKs\Win32\OpenSSL\lib;..\..\..\..\STATICSDKS\XPLATFORM\STLPORT\lib;..\..\..\..\StaticSDKs\Win32\WMSDK\lib;&quot;..\..\..\..\StaticSDKs\XPlatform\jpeg-8c-rgba&quot;;..\..\..\..\StaticSDKs\Win32\eax\lib;..\..\..\..\StaticSDKs\win32\max7sdk\lib;..\..\..\..\StaticSDKs\Win32\oggvorbis\lib;&quot;..\..\..\..\StaticSDKs\Win32\speex-1.0.1\Win32\libspeex\Release&quot;;..\..\..\..\StaticSDKs\Win32\Bink\lib;..\..\..\..\StaticSDKs\Win32\dx8.1sdk\lib;..\..\..\..\..\StaticSDKs\Win32\DX9.0c\Lib;..\..\..\..\..\StaticSDKs\Win32\DX9.0c\Lib\x86;&quot;..\..\..\..\StaticSDKs\Win32\OpenAL 1.1 with EFX SDK\libs\Win32&quot;;..\..\..\..\StaticSDKs\XPlatform\png\lib;..\..\..\..\StaticSDKs\Win32\IJL\lib"
IgnoreDefaultLibraryNames="libc.lib,libci.lib,libcmt.lib"
ModuleDefinitionFile="..\..\..\Sources\Tools\MaxMain\main.def"
GenerateDebugInformation="FALSE"
@ -93,7 +93,7 @@ copy &quot;$(TargetPath)&quot; &quot;$(maxr7dir)&quot;\plugins
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="&quot;../../../SDKs/XPlatform/Cypython-2.3.3/pyconfig_static&quot;;&quot;../../../SDKs/XPlatform/Cypython-2.3.3/Include&quot;;&quot;../../../SDKs/XPlatform/Cypython-2.3.3/PC&quot;;..\..\..\sdks\win32\hawkvoice\lib;..\..\..\..\StaticSDKs\win32\max7sdk\include;../../../Sources/Plasma/NucleusLib/inc;..\..\..\Sources\Plasma\FeatureLib\inc;..\..\..\Sources\Plasma\PubUtilLib\inc;..\..\..\Sources\Plasma\CoreLib;../../../Sources/Tools/MaxAss;../../../../StaticSDKs/XPlatform/STLport/stlport;../../../../StaticSDKs/Win32/dx9.0c/include;../../../../StaticSDKs/Win32/PhysX/Physics/include;../../../../StaticSDKs/Win32/PhysX/PhysXLoader/include;../../../../StaticSDKs/Win32/PhysX/Cooking/include;../../../../StaticSDKs/Win32/PhysX/Foundation/include;../../../../StaticSDKs/Win32/PhysX/NxCharacter/include"
AdditionalIncludeDirectories="&quot;../../../SDKs/XPlatform/Cypython-2.3.3/pyconfig_static&quot;;&quot;../../../SDKs/XPlatform/Cypython-2.3.3/Include&quot;;&quot;../../../SDKs/XPlatform/Cypython-2.3.3/PC&quot;;..\..\..\sdks\win32\hawkvoice\lib;..\..\..\..\StaticSDKs\win32\max7sdk\include;../../../Sources/Plasma/NucleusLib/inc;..\..\..\Sources\Plasma\FeatureLib\inc;..\..\..\Sources\Plasma\PubUtilLib\inc;..\..\..\Sources\Plasma\CoreLib;../../../Sources/Tools/MaxAss;../../../../StaticSDKs/XPlatform/STLport/stlport;../../../../StaticSDKs/Win32/dx9.0c/include;../../../../StaticSDKs/Win32/PhysX/Physics/include;../../../../StaticSDKs/Win32/PhysX/PhysXLoader/include;../../../../StaticSDKs/Win32/PhysX/Cooking/include;../../../../StaticSDKs/Win32/PhysX/Foundation/include;../../../../StaticSDKs/Win32/PhysX/NxCharacter/include;../../../../StaticSDKs/Win32/OpenSSL/include"
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;MAXPLUGINCODE;MS_NO_COREDLL"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@ -110,11 +110,11 @@ copy &quot;$(TargetPath)&quot; &quot;$(maxr7dir)&quot;\plugins
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Iphlpapi.lib oldnames.lib ogg_static_d.lib vorbis_static_d.lib vorbisfile_static_d.lib strmiids.lib libcrypto.a comsupp.lib binkw32.lib comctl32.lib winmm.lib vfw32.lib ws2_32.lib wininet.lib shlwapi.lib odbc32.lib odbccp32.lib wmstub.lib wmvcore.lib ijl15l.lib eaxguid.lib bmm.lib core.lib geom.lib gfx.lib mesh.lib maxutil.lib maxscrpt.lib manipsys.lib paramblk2.lib gup.lib libspeex.lib eax.lib Rpcrt4.lib largeint.lib OpenAL32.lib PhysXLoader.lib NxExtensions.lib"
AdditionalDependencies="Iphlpapi.lib oldnames.lib ogg_static_d.lib vorbis_static_d.lib vorbisfile_static_d.lib strmiids.lib libeay32.lib comsupp.lib comctl32.lib winmm.lib vfw32.lib ws2_32.lib wininet.lib shlwapi.lib odbc32.lib odbccp32.lib d3dx9.lib dinput8.lib dsound.lib DxErr9.lib dxguid.lib wmstub.lib wmvcore.lib ijl15l.lib bmm.lib core.lib geom.lib gfx.lib mesh.lib maxutil.lib maxscrpt.lib manipsys.lib paramblk2.lib gup.lib libspeex.lib Rpcrt4.lib largeint.lib OpenAL32.lib PhysXLoader.lib NxExtensions.lib libpngd.lib binkw32.lib"
OutputFile="Debug/PlasmaMax_dbg.gup"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="&quot;..\..\..\..\StaticSDKs\XPlatform\expat-1.95.7\StaticLibs\Win32&quot;;..\..\..\..\StaticSDKs\Win32\OpenSSL\lib;..\..\..\..\STATICSDKS\XPLATFORM\STLPORT\lib;..\..\..\..\StaticSDKs\Win32\WMSDK\lib;..\..\..\..\STATICSDKS\Win32\ijl\lib;..\..\..\..\StaticSDKs\Win32\eax\lib;..\..\..\..\StaticSDKs\win32\max7sdk\lib;..\..\..\..\StaticSDKs\Win32\oggvorbis\lib;&quot;..\..\..\..\StaticSDKs\Win32\speex-1.0.1\Win32\libspeex\Release&quot;;..\..\..\..\StaticSDKs\Win32\Bink\lib;..\..\..\..\StaticSDKs\Win32\dx8.1sdk\lib;&quot;..\..\..\..\StaticSDKs\Win32\OpenAL 1.1 with EFX SDK\libs\Win32&quot;;..\..\..\..\StaticSDKs\Win32\PhysX\lib\Win32"
AdditionalLibraryDirectories="&quot;..\..\..\..\StaticSDKs\XPlatform\expat-1.95.7\StaticLibs\Win32&quot;;..\..\..\..\StaticSDKs\Win32\OpenSSL\lib;..\..\..\..\STATICSDKS\XPLATFORM\STLPORT\lib;..\..\..\..\StaticSDKs\Win32\WMSDK\lib;&quot;..\..\..\..\StaticSDKs\XPlatform\jpeg-8c-rgba&quot;;..\..\..\..\StaticSDKs\Win32\eax\lib;..\..\..\..\StaticSDKs\win32\max7sdk\lib;..\..\..\..\StaticSDKs\Win32\oggvorbis\lib;&quot;..\..\..\..\StaticSDKs\Win32\speex-1.0.1\Win32\libspeex\Release&quot;;..\..\..\..\StaticSDKs\Win32\Bink\lib;..\..\..\..\StaticSDKs\Win32\dx8.1sdk\lib;..\..\..\..\..\StaticSDKs\Win32\DX9.0c\Lib;..\..\..\..\..\StaticSDKs\Win32\DX9.0c\Lib\x86;&quot;..\..\..\..\StaticSDKs\Win32\OpenAL 1.1 with EFX SDK\libs\Win32&quot;;..\..\..\..\StaticSDKs\Win32\PhysX\lib\Win32;..\..\..\..\StaticSDKs\XPlatform\png\lib;..\..\..\..\StaticSDKs\Win32\IJL\lib"
IgnoreDefaultLibraryNames="libcd.lib,libc.lib,libci.lib,libcid.lib,libcmt.lib,libcmtd.lib"
ModuleDefinitionFile="..\..\..\Sources\Tools\MaxMain\main.def"
GenerateDebugInformation="TRUE"
@ -155,6 +155,9 @@ copy &quot;$(TargetPath)&quot; &quot;$(maxr7dir)&quot;\plugins
</Configuration>
</Configurations>
<References>
<ProjectReference
ReferencedProjectIdentifier="{17A0AA3A-8445-4C66-FE58-0A5C222CC474}"
Name="plClientResMgr"/>
</References>
<Files>
<Filter
@ -896,25 +899,6 @@ copy &quot;$(TargetPath)&quot; &quot;$(maxr7dir)&quot;\plugins
RelativePath="..\..\..\..\StaticSDKs\Win32\Max7sdk\lib\Paramblk2.lib">
</File>
</Filter>
<Filter
Name="DX9"
Filter="">
<File
RelativePath="..\..\..\..\StaticSDKs\Win32\DX9.0c\Lib\d3dx9.lib">
</File>
<File
RelativePath="..\..\..\..\StaticSDKs\Win32\DX9.0c\Lib\dinput8.lib">
</File>
<File
RelativePath="..\..\..\..\StaticSDKs\Win32\DX9.0c\Lib\dsound.lib">
</File>
<File
RelativePath="..\..\..\..\StaticSDKs\Win32\DX9.0c\Lib\DxErr9.lib">
</File>
<File
RelativePath="..\..\..\..\StaticSDKs\Win32\DX9.0c\Lib\dxguid.lib">
</File>
</Filter>
<Filter
Name="PhysX"
Filter="">

17
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Tools/MaxPlasmaMtls/MaxPlasmaMtls.vcproj
View File

@ -903,23 +903,6 @@
Filter="">
<File
RelativePath="..\..\..\Sources\Tools\MaxPlasmaMtls\plBinkBitmap.cpp">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\..\Sources\Tools\MaxPlasmaMtls\plBinkBitmap.h">

8
MOULOpenSourceClientPlugin/Plasma20/MsDevProjects/Tools/plFontConverter/plFontConverter.vcproj
View File

@ -38,11 +38,11 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib wininet.lib winmm.lib odbc32.lib odbccp32.lib comctl32.lib Shlwapi.lib libcrypto.a freetype214_D.lib ijl15l.lib Rpcrt4.lib"
AdditionalDependencies="ws2_32.lib wininet.lib winmm.lib odbc32.lib odbccp32.lib comctl32.lib Shlwapi.lib libeay32.lib freetype214_D.lib libjpeg.lib Rpcrt4.lib"
OutputFile=".\Debug/plFontConverter.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\..\StaticSDKs\Win32\OpenSSL\lib,../../../../StaticSDKs/Win32/freetype-2.1.4/objs,..\..\..\..\StaticSDKs\Win32\IJL\lib"
AdditionalLibraryDirectories="..\..\..\..\StaticSDKs\Win32\OpenSSL\lib;&quot;../../../../StaticSDKs/Win32/freetype-2.1.4/objs&quot;;&quot;..\..\..\..\StaticSDKs\XPlatform\jpeg-8c-rgba&quot;"
IgnoreDefaultLibraryNames="libc.lib"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\Debug/plFontConverter.pdb"
@ -106,11 +106,11 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib wininet.lib winmm.lib odbc32.lib odbccp32.lib comctl32.lib Shlwapi.lib libcrypto.a freetype214.lib ijl15l.lib Rpcrt4.lib"
AdditionalDependencies="ws2_32.lib wininet.lib winmm.lib odbc32.lib odbccp32.lib comctl32.lib Shlwapi.lib libeay32.lib freetype214.lib libjpeg.lib Rpcrt4.lib"
OutputFile=".\Release/plFontConverter.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\..\StaticSDKs\Win32\OpenSSL\lib,../../../../StaticSDKs/Win32/freetype-2.1.4/objs,..\..\..\..\StaticSDKs\Win32\IJL\lib"
AdditionalLibraryDirectories="..\..\..\..\StaticSDKs\Win32\OpenSSL\lib;&quot;../../../../StaticSDKs/Win32/freetype-2.1.4/objs&quot;;&quot;..\..\..\..\StaticSDKs\XPlatform\jpeg-8c-rgba&quot;"
IgnoreDefaultLibraryNames="libc.lib"
ProgramDatabaseFile=".\Release/plFontConverter.pdb"
SubSystem="2"

0
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/external/scalergba.py vendored Executable file → Normal file
View File

57
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/pyCCRMgr.h → MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/loginfix.h
View File

@ -39,18 +39,53 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
Mead, WA 99021
*==LICENSE==*/
#ifndef pyCCRMgr_h_inc
#define pyCCRMgr_h_inc
//////////////////////////////////////////////////////////////////////
//
// pyCCRMgr - a wrapper class to provide interface to the pfCCR stuff
//
//////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
// The stuff below seems to be missing fron WinIoCtl.h in MSVC2003 but is
// probably present in later versions. This was robbed from MSDN to fill
// the gap.
#include "hsTypes.h"
#include "hsStlUtils.h"
#include "../pfCCR/plCCRMgr.h"
#if (_MSC_VER < 1500) // For VS2005 and earlier only (might need to make it VS2003 only (1310))
#define IOCTL_STORAGE_QUERY_PROPERTY CTL_CODE(IOCTL_STORAGE_BASE, 0x0500, METHOD_BUFFERED, FILE_ANY_ACCESS)
#endif // pyCCRMgr_h_inc
// retrieve the storage device descriptor data for a device.
typedef struct _STORAGE_DEVICE_DESCRIPTOR {
ULONG Version;
ULONG Size;
UCHAR DeviceType;
UCHAR DeviceTypeModifier;
BOOLEAN RemovableMedia;
BOOLEAN CommandQueueing;
ULONG VendorIdOffset;
ULONG ProductIdOffset;
ULONG ProductRevisionOffset;
ULONG SerialNumberOffset;
STORAGE_BUS_TYPE BusType;
ULONG RawPropertiesLength;
UCHAR RawDeviceProperties[1];
} STORAGE_DEVICE_DESCRIPTOR, *PSTORAGE_DEVICE_DESCRIPTOR;
// retrieve the properties of a storage device or adapter.
typedef enum _STORAGE_QUERY_TYPE {
PropertyStandardQuery = 0,
PropertyExistsQuery,
PropertyMaskQuery,
PropertyQueryMaxDefined
} STORAGE_QUERY_TYPE, *PSTORAGE_QUERY_TYPE;
// retrieve the properties of a storage device or adapter.
typedef enum _STORAGE_PROPERTY_ID {
StorageDeviceProperty = 0,
StorageAdapterProperty,
StorageDeviceIdProperty
} STORAGE_PROPERTY_ID, *PSTORAGE_PROPERTY_ID;
// retrieve the properties of a storage device or adapter.
typedef struct _STORAGE_PROPERTY_QUERY {
STORAGE_PROPERTY_ID PropertyId;
STORAGE_QUERY_TYPE QueryType;
UCHAR AdditionalParameters[1];
} STORAGE_PROPERTY_QUERY, *PSTORAGE_PROPERTY_QUERY;
#endif
// End of stuff taken from MSDN

6
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/plClient.cpp
View File

@ -273,7 +273,9 @@ hsBool plClient::Shutdown()
IKillMovies();
plgAudioSys::Activate(false);
#ifdef USE_BINK_SDK
plBinkPlayer::DeInit();
#endif
//
// Get any proxies to commit suicide.
plProxyDrawMsg* nuke = TRACKED_NEW plProxyDrawMsg(plProxyDrawMsg::kAllTypes
@ -1512,12 +1514,14 @@ hsBool plClient::StartInit()
plgAudioSys::Activate(true);
#ifdef USE_BINK_SDK
plConst(hsScalar) delay(2.f);
//commenting out publisher splash for MORE
//IPlayIntroBink("avi/intro0.bik", delay, 0.f, 0.f, 1.f, 1.f, 0.75);
//if( GetDone() ) return false;
IPlayIntroBink("avi/intro1.bik", 0.f, 0.f, 0.f, 1.f, 1.f, 0.75);
if( GetDone() ) return false;
#endif // USE_BINK_SDK
plgDispatch::Dispatch()->RegisterForExactType(plMovieMsg::Index(), GetKey());
//
@ -1980,6 +1984,7 @@ void plClient::IKillMovies()
fMovies.Reset();
}
#ifdef USE_BINK_SDK
hsBool plClient::IPlayIntroBink(const char* movieName, hsScalar endDelay, hsScalar posX, hsScalar posY, hsScalar scaleX, hsScalar scaleY, hsScalar volume /* = 1.0 */)
{
SetQuitIntro(false);
@ -2028,6 +2033,7 @@ hsBool plClient::IPlayIntroBink(const char* movieName, hsScalar endDelay, hsScal
}
return false;
}
#endif // USE_BINK_SDK
hsBool plClient::IFlushRenderRequests()
{

2
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/plClient.h
View File

@ -191,7 +191,9 @@ protected:
void IProcessRenderRequests(hsTArray<plRenderRequest*>& reqs);
void IAddRenderRequest(plRenderRequest* req);
#ifdef USE_BINK_SDK
hsBool IPlayIntroBink(const char* movieName, hsScalar endDelay, hsScalar posX, hsScalar posY, hsScalar scaleX, hsScalar scaleY, hsScalar volume = 1.0);
#endif // USE_BINK_SDK
hsBool IHandleMovieMsg(plMovieMsg* mov);
void IKillMovies();
void IServiceMovies();

381
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/winmain.cpp
View File

@ -76,6 +76,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include <shellapi.h>
#include "WinHttp.h"
#include "loginfix.h"
//
// Defines
//
@ -93,6 +94,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#define STATUS_PATH L"support.cyanworlds.com"
#endif
//
// Globals
//
@ -198,11 +200,25 @@ struct LoginDialogParam {
wchar accountName[kMaxAccountNameLength];
};
// List of hash styles we are going to test against the server
// ... this method of trying multiple hashes against the server has risks of being more compromised than just testing one hash.
// ... So, if you know your unique client is only going to connect to your server then it would be wise to limit the testing to one hash.
// ... Which can be done simply by setting FIRST_PASSWORD_HASH and LAST_PASSWORD_HASH to the hash that you use.
enum
{
kPasswordHashSHA0,
kPasswordHashSHA1
};
static const int FIRST_PASSWORD_HASH = kPasswordHashSHA1;
static const int LAST_PASSWORD_HASH = kPasswordHashSHA0;
bool AuthenticateNetClientComm(ENetError* result, HWND parentWnd);
bool IsExpired();
bool GetDisksProperty(HANDLE hDevice, PSTORAGE_DEVICE_DESCRIPTOR pDevDesc);
void GetOldCryptKey(UInt32* cryptKey, unsigned size);
void GetCryptKey(UInt32* cryptKey, unsigned size);
static void SaveUserPass (char *username, char *password, ShaDigest *pNamePassHash, bool remember_password,
bool fromGT);
int whichHash);
static void LoadUserPass (const wchar *accountName, char *username, ShaDigest *pNamePassHash, bool *pRemember,
bool fromGT, int *pFocus);
static void AuthFailedStrings (ENetError authError, bool fromGT,
@ -318,11 +334,22 @@ static bool TGRunLoginDialog (const wchar *accountName, bool fromGT)
if (Remember[0] == 'y')
bRemember = true;
SaveUserPass (Username, Password, &NamePassHash, bRemember, fromGT);
// Do login & see if it failed
// cycle through the hash types until we find one that matches or errors out
ENetError auth;
bool cancelled = AuthenticateNetClientComm(&auth, NULL);
bool cancelled;
for (int whichHash=FIRST_PASSWORD_HASH; whichHash >= LAST_PASSWORD_HASH; whichHash-- )
{
SaveUserPass (Username, Password, &NamePassHash, bRemember, whichHash);
// Do login & see if it failed
cancelled = AuthenticateNetClientComm(&auth, NULL);
// if the password was successful then go to the end processing
if (IS_NET_SUCCESS(auth) && !cancelled)
break;
// if it was cancelled or any error other than wrong password then go to end processing
if (cancelled || auth != kNetErrAuthenticationFailed)
break;
}
if (IS_NET_SUCCESS (auth) && !cancelled)
break;
@ -433,35 +460,43 @@ void DebugMsgF(const char* format, ...);
LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{
static bool gDragging = false;
static UInt32 keyState=0;
static UInt8 mouse_down = 0;
// Handle messages
switch (message) {
case WM_KEYDOWN :
case WM_LBUTTONDOWN :
case WM_RBUTTONDOWN :
case WM_LBUTTONDBLCLK : // The left mouse button was double-clicked.
case WM_MBUTTONDBLCLK : // The middle mouse button was double-clicked.
case WM_MBUTTONDOWN : // The middle mouse button was pressed.
case WM_RBUTTONDBLCLK : // The right mouse button was double-clicked.
case WM_LBUTTONDOWN:
case WM_RBUTTONDOWN:
case WM_LBUTTONDBLCLK:
case WM_MBUTTONDBLCLK:
case WM_MBUTTONDOWN:
case WM_RBUTTONDBLCLK:
// Ensure we don't leave the client area during clicks
if (!(mouse_down++))
SetCapture(hWnd);
// fall through to old case
case WM_KEYDOWN:
// If they did anything but move the mouse, quit any intro movie playing.
if (gClient)
{
if( gClient )
gClient->SetQuitIntro(true);
}
// Fall through to other events
case WM_KEYUP :
case WM_LBUTTONUP :
case WM_RBUTTONUP :
case WM_MBUTTONUP : // The middle mouse button was released.
case 0x020A: // fuc&ing windows b.s...
{
if (gClient && gClient->WindowActive() && gClient->GetInputManager())
{
gClient->SetQuitIntro(true);
// normal input processing
if (gClient->WindowActive() && gClient->GetInputManager())
gClient->GetInputManager()->HandleWin32ControlEvent(message, wParam, lParam, hWnd);
}
}
break;
case WM_LBUTTONUP:
case WM_RBUTTONUP:
case WM_MBUTTONUP:
// Stop hogging the cursor
if (!(--mouse_down))
ReleaseCapture();
// fall through to input processing
case WM_MOUSEWHEEL:
case WM_KEYUP:
if (gClient && gClient->WindowActive() && gClient->GetInputManager())
gClient->GetInputManager()->HandleWin32ControlEvent(message, wParam, lParam, hWnd);
break;
case WM_MOUSEMOVE:
{
@ -921,18 +956,6 @@ void DebugMsgF(const char* format, ...)
#endif
}
static bool IsMachineLittleEndian() {
int i = 1;
char *p = (char *) &i;
if (p[0] == 1) // Lowest address contains the least significant byte
return true;
else
return false;
}
inline static dword ToBigEndian (dword value) {
return ((value) << 24) | ((value & 0x0000ff00) << 8) | ((value & 0x00ff0000) >> 8) | ((value) >> 24);
}
static void AuthFailedStrings (ENetError authError, bool fromGT,
const char **ppStr1, const char **ppStr2,
@ -1069,7 +1092,7 @@ BOOL CALLBACK UruTOSDialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
}
static void SaveUserPass (char *username, char *password, ShaDigest *pNamePassHash, bool remember_password,
bool fromGT)
int whichHash)
{
UInt32 cryptKey[4];
ZeroMemory(cryptKey, sizeof(cryptKey));
@ -1086,27 +1109,30 @@ static void SaveUserPass (char *username, char *password, ShaDigest *pNamePassHa
{
StrToUnicode(wpassword, password, arrsize(wpassword));
wchar domain[15];
PathSplitEmail(wusername, nil, 0, domain, arrsize(domain), nil, 0, nil, 0, 0);
switch( whichHash )
{
case kPasswordHashSHA1:
CryptDigest(
kCryptSha1,
pNamePassHash,
StrLen(password) * sizeof(password[0]),
password
);
if (StrLen(domain) == 0 || StrCmpI(domain, L"gametap") == 0) {
CryptDigest(
kCryptSha1,
pNamePassHash,
StrLen(password) * sizeof(password[0]),
password
);
// switch the endianness of the hash to big endian
// NOTE: this is legacy from GameTap days to match GameTap's endianness
pNamePassHash->data[0] = hsUNSWAP32(pNamePassHash->data[0]);
pNamePassHash->data[1] = hsUNSWAP32(pNamePassHash->data[1]);
pNamePassHash->data[2] = hsUNSWAP32(pNamePassHash->data[2]);
pNamePassHash->data[3] = hsUNSWAP32(pNamePassHash->data[3]);
pNamePassHash->data[4] = hsUNSWAP32(pNamePassHash->data[4]);
break;
if (IsMachineLittleEndian()) {
pNamePassHash->data[0] = ToBigEndian(pNamePassHash->data[0]);
pNamePassHash->data[1] = ToBigEndian(pNamePassHash->data[1]);
pNamePassHash->data[2] = ToBigEndian(pNamePassHash->data[2]);
pNamePassHash->data[3] = ToBigEndian(pNamePassHash->data[3]);
pNamePassHash->data[4] = ToBigEndian(pNamePassHash->data[4]);
}
case kPasswordHashSHA0:
default:
CryptHashPassword(wusername, wpassword, pNamePassHash);
break;
}
else
CryptHashPassword(wusername, wpassword, pNamePassHash);
}
NetCommSetAccountUsernamePassword(wusername, *pNamePassHash);
@ -1115,28 +1141,26 @@ static void SaveUserPass (char *username, char *password, ShaDigest *pNamePassHa
else
NetCommSetAuthTokenAndOS(nil, L"win");
if (!fromGT) {
wchar fileAndPath[MAX_PATH];
PathGetInitDirectory(fileAndPath, arrsize(fileAndPath));
PathAddFilename(fileAndPath, fileAndPath, L"login.dat", arrsize(fileAndPath));
wchar fileAndPath[MAX_PATH];
PathGetInitDirectory(fileAndPath, arrsize(fileAndPath));
PathAddFilename(fileAndPath, fileAndPath, L"login.dat", arrsize(fileAndPath));
#ifndef PLASMA_EXTERNAL_RELEASE
// internal builds can use the local init directory
wchar localFileAndPath[MAX_PATH];
StrCopy(localFileAndPath, L"init\\login.dat", arrsize(localFileAndPath));
if (PathDoesFileExist(localFileAndPath))
StrCopy(fileAndPath, localFileAndPath, arrsize(localFileAndPath));
// internal builds can use the local init directory
wchar localFileAndPath[MAX_PATH];
StrCopy(localFileAndPath, L"init\\login.dat", arrsize(localFileAndPath));
if (PathDoesFileExist(localFileAndPath))
StrCopy(fileAndPath, localFileAndPath, arrsize(localFileAndPath));
#endif
hsStream* stream = plEncryptedStream::OpenEncryptedFileWrite(fileAndPath, cryptKey);
if (stream)
{
stream->Write(sizeof(cryptKey), cryptKey);
stream->WriteSafeString(username);
stream->Writebool(remember_password);
if (remember_password)
stream->Write(sizeof(pNamePassHash->data), pNamePassHash->data);
stream->Close();
delete stream;
}
hsStream* stream = plEncryptedStream::OpenEncryptedFileWrite(fileAndPath, cryptKey);
if (stream)
{
stream->Write(sizeof(cryptKey), cryptKey);
stream->WriteSafeString(username);
stream->Writebool(remember_password);
if (remember_password)
stream->Write(sizeof(pNamePassHash->data), pNamePassHash->data);
stream->Close();
delete stream;
}
}
@ -1147,10 +1171,15 @@ static void LoadUserPass (const wchar *accountName, char *username, ShaDigest *p
UInt32 cryptKey[4];
ZeroMemory(cryptKey, sizeof(cryptKey));
GetCryptKey(cryptKey, arrsize(cryptKey));
UInt32 cryptKeyOld[4]; // The old cryptKey stuff
ZeroMemory(cryptKeyOld, sizeof(cryptKeyOld));
GetOldCryptKey(cryptKeyOld, arrsize(cryptKeyOld));
char* temp;
*pRemember = false;
username[0] = '\0';
bool cryptKeyOk = false;
bool cryptKeyOldOk = false;
if (!fromGT)
{
@ -1178,6 +1207,42 @@ static void LoadUserPass (const wchar *accountName, char *username, ShaDigest *p
{
StrCopy(username, temp, kMaxAccountNameLength);
delete temp;
cryptKeyOk = true;
}
else
username[0] = '\0';
*pRemember = stream->Readbool();
if (*pRemember)
{
stream->Read(sizeof(pNamePassHash->data), pNamePassHash->data);
*pFocus = IDOK;
}
else
*pFocus = IDC_URULOGIN_PASSWORD;
}
stream->Close();
delete stream;
}
if (!cryptKeyOk) // Try the old cryptKey
{
hsStream* stream = plEncryptedStream::OpenEncryptedFile(fileAndPath, true, cryptKeyOld);
if (stream && !stream->AtEnd())
{
UInt32 savedKey[4];
stream->Read(sizeof(savedKey), savedKey);
if (memcmp(cryptKeyOld, savedKey, sizeof(savedKey)) == 0)
{
temp = stream->ReadSafeString();
if (temp)
{
StrCopy(username, temp, kMaxAccountNameLength);
delete temp;
cryptKeyOldOk = true;
}
else
username[0] = '\0';
@ -1195,6 +1260,21 @@ static void LoadUserPass (const wchar *accountName, char *username, ShaDigest *p
stream->Close();
delete stream;
} // Done trying the old cryptKey
}
if (cryptKeyOldOk) // We need to re-write the login.dat file
{
hsStream* stream = plEncryptedStream::OpenEncryptedFileWrite(fileAndPath, cryptKey);
if (stream)
{
stream->Write(sizeof(cryptKey), cryptKey);
stream->WriteSafeString(username);
stream->Writebool(*pRemember);
if (*pRemember)
stream->Write(sizeof(pNamePassHash->data), pNamePassHash->data);
stream->Close();
delete stream;
}
}
}
else
@ -1242,20 +1322,24 @@ void StatusCallback(void *param)
{
static char data[256] = {0};
DWORD bytesRead;
WinHttpSendRequest(
hRequest,
WINHTTP_NO_ADDITIONAL_HEADERS,
0,
WINHTTP_NO_REQUEST_DATA,
0,
0,
0
);
WinHttpReceiveResponse(hRequest, 0);
WinHttpReadData(hRequest, data, 255, &bytesRead);
data[bytesRead] = 0;
if(bytesRead)
if(
WinHttpSendRequest(
hRequest,
WINHTTP_NO_ADDITIONAL_HEADERS,
0,
WINHTTP_NO_REQUEST_DATA,
0,
0,
0
)
&& WinHttpReceiveResponse(hRequest, 0)
&& WinHttpReadData(hRequest, data, 255, &bytesRead)
&& bytesRead
)
{
data[bytesRead] = 0;
PostMessage(hwnd, WM_USER_SETSTATUSMSG, 0, (LPARAM) data);
}
}
}
}
@ -1367,11 +1451,22 @@ BOOL CALLBACK UruLoginDialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
GetDlgItemText(hwndDlg, IDC_URULOGIN_PASSWORD, password, kMaxPasswordLength);
remember_password = (IsDlgButtonChecked(hwndDlg, IDC_URULOGIN_REMEMBERPASS) == BST_CHECKED);
SaveUserPass (username, password, &namePassHash, remember_password, loginParam->fromGT);
// cycle through the hash types until we find one that matches or errors out
LoginDialogParam loginParam;
MemSet(&loginParam, 0, sizeof(loginParam));
bool cancelled = AuthenticateNetClientComm(&loginParam.authError, hwndDlg);
bool cancelled;
for (int whichHash=FIRST_PASSWORD_HASH; whichHash >= LAST_PASSWORD_HASH; whichHash-- )
{
SaveUserPass (username, password, &namePassHash, remember_password, whichHash);
MemSet(&loginParam, 0, sizeof(loginParam));
cancelled = AuthenticateNetClientComm(&loginParam.authError, hwndDlg);
// if the password was successful then go to the end processing
if (IS_NET_SUCCESS(loginParam.authError) && !cancelled)
break;
// if it was cancelled or any error other than wrong password then go to end processing
if (cancelled || loginParam.authError != kNetErrAuthenticationFailed)
break;
}
if (IS_NET_SUCCESS(loginParam.authError) && !cancelled)
EndDialog(hwndDlg, ok);
@ -2009,7 +2104,7 @@ bool IsExpired()
return expired;
}
void GetCryptKey(UInt32* cryptKey, unsigned numElements)
void GetOldCryptKey(UInt32* cryptKey, unsigned numElements)
{
char volName[] = "C:\\";
int index = 0;
@ -2040,3 +2135,99 @@ void GetCryptKey(UInt32* cryptKey, unsigned numElements)
}
}
void GetCryptKey(UInt32* cryptKey, unsigned numElements)
{
char volName[] = "C:\\";
char volID[] = "\\\\.\\C:"; // Need the drive ID in \\.\C: format for CreateFile()
int index = 0;
DWORD logicalDrives = GetLogicalDrives();
PSTORAGE_DEVICE_DESCRIPTOR pDevDesc;
for (int i = 2; i < 26; ++i) // Drives A: B: prove nothing
{
if (logicalDrives & (1 << i))
{
volName[0] = ('A' + i); // Previous base drive letter of C: was incorrect
UINT driveType = GetDriveType(
volName //LPCTSTR lpRootPathName
);
if (driveType != DRIVE_FIXED)
{
continue; // next i
}
// We've got "Fixed" drive but still need to check
// that it's not a USB (i.e. removable) drive.
HANDLE hDevice;
volID[4] = 'A' + i;
hDevice = CreateFile(
volID,
GENERIC_READ,
FILE_SHARE_READ | FILE_SHARE_WRITE,
NULL,
OPEN_EXISTING,
NULL,
NULL
);
if (hDevice != INVALID_HANDLE_VALUE)
{
pDevDesc = (PSTORAGE_DEVICE_DESCRIPTOR)new BYTE[sizeof(STORAGE_DEVICE_DESCRIPTOR) + 512 - 1];
if(pDevDesc != NULL)
{
pDevDesc->Size = sizeof(STORAGE_DEVICE_DESCRIPTOR) + 512 - 1;
if (GetDisksProperty(hDevice, pDevDesc))
{
if (pDevDesc->BusType == BusTypeUsb) // This is the <20>Check Point<6E>!!! ;-)
continue; // next i
}
delete pDevDesc;
}
CloseHandle(hDevice);
}
DWORD volSerialNum = 0;
BOOL result = GetVolumeInformation(
volName, //LPCTSTR lpRootPathName,
NULL, //LPTSTR lpVolumeNameBuffer,
0, //DWORD nVolumeNameSize,
&volSerialNum, //LPDWORD lpVolumeSerialNumber,
NULL, //LPDWORD lpMaximumComponentLength,
NULL, //LPDWORD lpFileSystemFlags,
NULL, //LPTSTR lpFileSystemNameBuffer,
0 //DWORD nFileSystemNameSize
);
if (!result)
continue; // next i
cryptKey[index] = (cryptKey[index] ^ volSerialNum);
index = (++index) % numElements;
}
}
}
bool GetDisksProperty(HANDLE hDevice, PSTORAGE_DEVICE_DESCRIPTOR pDevDesc)
{
STORAGE_PROPERTY_QUERY Query; // input param for query
DWORD dwOutBytes; // IOCTL output length
BOOL bResult; // IOCTL return val
// specify the query type
Query.PropertyId = StorageDeviceProperty;
Query.QueryType = PropertyStandardQuery;
// Query using IOCTL_STORAGE_QUERY_PROPERTY
bResult = ::DeviceIoControl(hDevice, // device handle
IOCTL_STORAGE_QUERY_PROPERTY, // info of device property
&Query, sizeof(STORAGE_PROPERTY_QUERY), // input data buffer
pDevDesc, pDevDesc->Size, // output data buffer
&dwOutBytes, // out's length
(LPOVERLAPPED)NULL);
return bResult;
}

2
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plPageOptimizer/pfAllCreatables.cpp
View File

@ -49,6 +49,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "../pfAudio/pfAudioCreatable.h"
#include "../pfPython/pfPythonCreatable.h"
#include "../pfGameGUIMgr/pfGameGUIMgrCreatable.h"
#ifdef PLASMA_CCR_RELEASE
#include "../pfCCR/plCCRCreatable.h"
#endif // PLASMA_CCR_RELEASE
#include "../pfJournalBook/pfJournalBookCreatable.h"
#include "../pfGameMgr/pfGameMgrCreatables.h"

2
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plPlasmaInstaller/plUnzip.h
View File

@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#define plUnzip_h_inc
#include "hsTypes.h"
#include "../src/contrib/minizip/unzip.h"
#include "contrib/minizip/unzip.h"
class plUnzip
{

10
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plUruLauncher/Main.cpp
View File

@ -668,7 +668,7 @@ static void HttpRequestGet(HINTERNET hConnect)
const wchar *path = BuildTypeServerStatusPath();
HINTERNET hRequest = 0;
char data[256] = {0};
DWORD bytesRead;
DWORD bytesRead = 0;
hRequest = WinHttpOpenRequest(
hConnect,
@ -693,9 +693,11 @@ static void HttpRequestGet(HINTERNET hConnect)
if(b)
{
DWORD err = GetLastError();
WinHttpReceiveResponse(hRequest, 0);
WinHttpReadData(hRequest, data, arrsize(data)-1, &bytesRead);
data[bytesRead] = 0;
if (WinHttpReceiveResponse(hRequest, 0)
&& WinHttpReadData(hRequest, data, arrsize(data) - 1, &bytesRead))
{
data[bytesRead] = 0;
}
}
}
if(bytesRead)

9
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/CoreLib/hsColorRGBA.h
View File

@ -71,6 +71,7 @@ struct hsColorRGBA {
hsColorRGBA& FromARGB32(UInt32 c);
UInt32 ToARGB32() const;
UInt32 ToARGB32Premultiplied() const;
void Read(hsStream *stream);
void Write(hsStream *stream) const;
@ -109,6 +110,14 @@ inline UInt32 hsColorRGBA::ToARGB32() const
| (UInt32(b * 255.99f) << 0);
}
inline UInt32 hsColorRGBA::ToARGB32Premultiplied() const
{
return (UInt32(a * 255.0f + 0.5f) << 24)
| (UInt32(a * r * 255.0f + 0.5f) << 16)
| (UInt32(a * g * 255.0f + 0.5f) << 8)
| (UInt32(a * b * 255.0f + 0.5f) << 0);
}
inline hsColorRGBA operator+(const hsColorRGBA& s, const hsColorRGBA& t)
{
hsColorRGBA res;

2
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/inc/pfAllCreatables.h
View File

@ -54,7 +54,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "../pfAudio/pfAudioCreatable.h"
#include "../pfPython/pfPythonCreatable.h"
#include "../pfGameGUIMgr/pfGameGUIMgrCreatable.h"
#ifdef PLASMA_CCR_RELEASE
#include "../pfCCR/plCCRCreatable.h"
#endif // PLASMA_CCR_RELEASE
#include "../pfJournalBook/pfJournalBookCreatable.h"
#include "../pfGameMgr/pfGameMgrCreatables.h"
#include "../pfSecurePreloader/pfSecurePreloaderCreatable.h"

2
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfAudio/plListener.cpp
View File

@ -57,7 +57,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "../plAvatar/plAvatarMgr.h"
#include "../plAvatar/plArmatureMod.h"
#include "../plAvatar/plAvCallbackAction.h"
#include "../plAvatar/plPhysicalControllerCore.h"
hsBool plListener::fPrintDbgInfo = false;

48
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfCCR/plCCRCreatable.h
View File

@ -1,48 +0,0 @@
/*==LICENSE==*
CyanWorlds.com Engine - MMOG client, server and tools
Copyright (C) 2011 Cyan Worlds, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Additional permissions under GNU GPL version 3 section 7
If you modify this Program, or any covered work, by linking or
combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
(or a modified version of those libraries),
containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
licensors of this Program grant you additional
permission to convey the resulting work. Corresponding Source for a
non-source form of such a combination shall include the source code for
the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
work.
You can contact Cyan Worlds, Inc. by email legal@cyan.com
or by snail mail at:
Cyan Worlds, Inc.
14617 N Newport Hwy
Mead, WA 99021
*==LICENSE==*/
#ifndef plCCRCreatable_inc
#define plCCRCreatable_inc
#include "plCCRMgr.h"
#endif // plCCRCreatable_inc

47
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfCCR/plCCRMgr.cpp
View File

@ -1,47 +0,0 @@
/*==LICENSE==*
CyanWorlds.com Engine - MMOG client, server and tools
Copyright (C) 2011 Cyan Worlds, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Additional permissions under GNU GPL version 3 section 7
If you modify this Program, or any covered work, by linking or
combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
(or a modified version of those libraries),
containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
licensors of this Program grant you additional
permission to convey the resulting work. Corresponding Source for a
non-source form of such a combination shall include the source code for
the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
work.
You can contact Cyan Worlds, Inc. by email legal@cyan.com
or by snail mail at:
Cyan Worlds, Inc.
14617 N Newport Hwy
Mead, WA 99021
*==LICENSE==*/
#include "plCCRMgrBase.h"
#include "plCCRMgr.h"
// static
plCCRMgrBase* plCCRMgrBase::fBaseInstance=nil;

41
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfCCR/plCCRVault.cpp
View File

@ -1,41 +0,0 @@
/*==LICENSE==*
CyanWorlds.com Engine - MMOG client, server and tools
Copyright (C) 2011 Cyan Worlds, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Additional permissions under GNU GPL version 3 section 7
If you modify this Program, or any covered work, by linking or
combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
(or a modified version of those libraries),
containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
licensors of this Program grant you additional
permission to convey the resulting work. Corresponding Source for a
non-source form of such a combination shall include the source code for
the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
work.
You can contact Cyan Worlds, Inc. by email legal@cyan.com
or by snail mail at:
Cyan Worlds, Inc.
14617 N Newport Hwy
Mead, WA 99021
*==LICENSE==*/

46
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfCCR/plCCRVault.h
View File

@ -1,46 +0,0 @@
/*==LICENSE==*
CyanWorlds.com Engine - MMOG client, server and tools
Copyright (C) 2011 Cyan Worlds, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Additional permissions under GNU GPL version 3 section 7
If you modify this Program, or any covered work, by linking or
combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
(or a modified version of those libraries),
containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
licensors of this Program grant you additional
permission to convey the resulting work. Corresponding Source for a
non-source form of such a combination shall include the source code for
the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
work.
You can contact Cyan Worlds, Inc. by email legal@cyan.com
or by snail mail at:
Cyan Worlds, Inc.
14617 N Newport Hwy
Mead, WA 99021
*==LICENSE==*/
#ifndef plCCRVault_h
#define plCCRVault_h
#endif // plCCRVault_h

2
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfCamera/plCameraModifier.cpp
View File

@ -63,7 +63,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "../pnSceneObject/plSimulationInterface.h"
#include "../plAvatar/plAvatarMgr.h"
#include "../plAvatar/plArmatureMod.h"
#include "../plAvatar/plAvCallbackAction.h"
#include "../plAvatar/plPhysicalControllerCore.h"
// new stuff

38
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfCCRConsoleCommands.cpp
View File

@ -40,37 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
*==LICENSE==*/
//////////////////////////////////////////////////////////////////////////////
// //
// CCR Console Commands and Groups //
// These console commands are meant for use by customer care reps. //
// Eventually the functionality defined here will be accessed through a GUI//
// //
//////////////////////////////////////////////////////////////////////////////
//
// Only calls to the CCRMgr interface are allowed here
// See me if you need to include any other files...
//
#include "pfConsoleCmd.h"
#include "pfConsole.h"
#include "../pfCCR/plCCRMgr.h"
#include "../plNetClient/plNetClientMgr.h"
//// This is here so Microsoft VC won't decide to "optimize" this file out
// YOU ALSO NEED TO CALL THIS FXN
void pfConsoleCmdGroup::DummyCCR( void )
{
}
void PrintStringF(void pfun(const char *),const char * fmt, ...);
/////////////////////////////////////////////////////////////////
//
// Please see pfConsoleCommands.cpp for detailed instructions on
// how to add console commands.
//
/////////////////////////////////////////////////////////////////
#define PF_SANITY_CHECK( cond, msg ) { if( !( cond ) ) { PrintString( msg ); return; } }
#ifdef PLASMA_CCR_RELEASE
#error Adjust this to where the real pfCCRConsoleCommands.cpp lives and submit a pull request!
#include "pfCCRConsoleCommandsReal.cpp"
#endif // PLASMA_CCR_RELEASE

2
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfConsole/pfConsoleCmd.cpp
View File

@ -65,7 +65,9 @@ pfConsoleCmdGroup::pfConsoleCmdGroup( char *name, char *parent )
DummyJunior();
DummyNet();
DummyAvatar();
#ifdef PLASMA_CCR_RELEASE
DummyCCR();
#endif // PLASMA_CCR_RELEASE
fNext = nil;
fPrevPtr = nil;

24
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlMod.cpp
View File

@ -56,6 +56,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "../pnMessage/plRefMsg.h"
#include "../pnMessage/plEnableMsg.h"
#include "../pfMessage/pfGameGUIMsg.h"
#include "../plMessage/plDeviceRecreateMsg.h"
#include "../pnSceneObject/plDrawInterface.h"
#include "../pnSceneObject/plCoordinateInterface.h"
#include "../pnSceneObject/plAudioInterface.h"
@ -584,14 +585,16 @@ plProfile_CreateTimer("Gui", "RenderSetup", GUITime);
hsBool pfGUIControlMod::MsgReceive( plMessage *msg )
{
plRenderMsg* rend = plRenderMsg::ConvertNoRef( msg );
plDeviceRecreateMsg* device = plDeviceRecreateMsg::ConvertNoRef(msg);
if (rend || device) {
plPipeline* pipe = rend ? rend->Pipeline() : device->Pipeline();
if( rend )
{
plProfile_BeginLap(GUITime, this->GetKey()->GetUoid().GetObjectName());
// Only need it once
if( ISetUpDynTextMap( rend->Pipeline() ) )
plgDispatch::Dispatch()->UnRegisterForExactType( plRenderMsg::Index(), GetKey() );
ISetUpDynTextMap(pipe);
plProfile_EndLap(GUITime, this->GetKey()->GetUoid().GetObjectName());
if (rend)
plgDispatch::Dispatch()->UnRegisterForExactType(plRenderMsg::Index(), GetKey());
return true;
}
@ -603,12 +606,16 @@ hsBool pfGUIControlMod::MsgReceive( plMessage *msg )
if( refMsg->GetContext() & ( plRefMsg::kOnCreate | plRefMsg::kOnRequest | plRefMsg::kOnReplace ) )
{
fDynTextMap = plDynamicTextMap::ConvertNoRef( refMsg->GetRef() );
// Register for a render msg so we can leech the material when we finally
// have a pipeline to work with
// These tell us when we need to (re-)initialize the DTM
plgDispatch::Dispatch()->RegisterForExactType( plRenderMsg::Index(), GetKey() );
plgDispatch::Dispatch()->RegisterForExactType( plDeviceRecreateMsg::Index(), GetKey() );
}
else
{
fDynTextMap = nil;
plgDispatch::Dispatch()->UnRegisterForExactType( plDeviceRecreateMsg::Index(), GetKey() );
}
return true;
}
else if( refMsg->fType == kRefDynTextLayer )
@ -688,7 +695,7 @@ hsBool pfGUIControlMod::ISetUpDynTextMap( plPipeline *pipe )
extraH -= height;
fDynTextMap->Reset();
fDynTextMap->Create( width, height, HasFlag( kXparentBgnd ), extraW, extraH );
fDynTextMap->Create( width, height, HasFlag( kXparentBgnd ), extraW, extraH, true );
fDynTextMap->SetFont( GetColorScheme()->fFontFace, GetColorScheme()->fFontSize, GetColorScheme()->fFontFlags,
HasFlag( kXparentBgnd ) ? false : true );
@ -699,6 +706,7 @@ hsBool pfGUIControlMod::ISetUpDynTextMap( plPipeline *pipe )
// out with 1:1 mapping from textel to pixel
plLayer *layer = (plLayer *)fDynTextLayer;
layer->SetTransform( fDynTextMap->GetLayerTransform() );
layer->SetBlendFlags( layer->GetBlendFlags() | hsGMatState::kBlendAlphaPremultiplied );
// Let the derived classes do their things
IPostSetUpDynTextMap();

2
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIControlMod.h
View File

@ -247,6 +247,8 @@ class pfGUIControlMod : public plSingleModifier
virtual void SetColorScheme( pfGUIColorScheme *newScheme );
pfGUIColorScheme *GetColorScheme( void ) const;
virtual void UpdateColorScheme() { IPostSetUpDynTextMap(); IUpdate(); }
// should be override by specific GUIcontrol
virtual void PurgeDynaTextMapImage() {;}

4
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIEditBoxMod.cpp
View File

@ -197,9 +197,9 @@ void pfGUIEditBoxMod::IUpdate( void )
oldCursorPos = cursorPos;
cursorPos -= (Int16)fScrollPos;
if( 4 + cursorPos > fDynTextMap->GetVisibleWidth() - 18 )
if( 4 + cursorPos > fDynTextMap->GetVisibleWidth() - 4 - 2 )
{
fScrollPos += ( 4 + cursorPos ) - ( fDynTextMap->GetVisibleWidth() - 18 );
fScrollPos += ( 4 + cursorPos ) - ( fDynTextMap->GetVisibleWidth() - 4 - 2 );
}
else if( 4 + cursorPos < 4 )
{

4
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIListBoxMod.cpp
View File

@ -180,6 +180,10 @@ hsBool pfGUIListBoxMod::MsgReceive( plMessage *msg )
void pfGUIListBoxMod::IPostSetUpDynTextMap( void )
{
pfGUIColorScheme *scheme = GetColorScheme();
fDynTextMap->SetFont( scheme->fFontFace, scheme->fFontSize, scheme->fFontFlags,
!HasFlag( kXparentBgnd ));
ICalcWrapStarts();
ICalcScrollRange();
fReadyToRoll = true;

9
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMultiLineEditCtrl.cpp
View File

@ -308,6 +308,13 @@ void pfGUIMultiLineEditCtrl::SetScrollPosition( Int32 topLine )
fDialog->GetHandler()->DoSomething(this);
}
//// GetScrollPosition ///////////////////////////////////////////////////////
Int32 pfGUIMultiLineEditCtrl::GetScrollPosition()
{
return fScrollPos;
}
//// MoveCursor - by direction command////////////////////////////////////////////////
void pfGUIMultiLineEditCtrl::MoveCursor( Direction dir )
{
@ -2064,4 +2071,4 @@ void pfGUIMultiLineEditCtrl::DeleteLinesFromTop(int numLines)
SetBuffer(buffer, bufferLen);
delete [] buffer;
return;
}
}

3
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMultiLineEditCtrl.h
View File

@ -216,6 +216,8 @@ class pfGUIMultiLineEditCtrl : public pfGUIControlMod
virtual void PurgeDynaTextMapImage();
virtual void UpdateColorScheme() { fFontFlagsSet = 0; pfGUIControlMod::UpdateColorScheme(); }
// Extended event types
enum ExtendedEvents
{
@ -225,6 +227,7 @@ class pfGUIMultiLineEditCtrl : public pfGUIControlMod
};
void SetScrollPosition( Int32 topLine );
Int32 GetScrollPosition();
void MoveCursor( Direction dir );
void InsertChar( char c );

2
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUITextBoxMod.h
View File

@ -102,8 +102,6 @@ class pfGUITextBoxMod : public pfGUIControlMod
void SetLocalizationPath(const wchar_t* path);
void SetLocalizationPath(const char* path);
void SetUseLocalizationPath(bool use);
virtual void UpdateColorScheme() { IPostSetUpDynTextMap(); IUpdate(); }
};
#endif // _pfGUITextBoxMod_h

30
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp
View File

@ -78,7 +78,9 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "../plSurface/plLayer.h"
#include "../plSurface/hsGMaterial.h"
#include "../plAgeLoader/plAgeLoader.h"
#ifdef USE_BINK_SDK
#include "../pfSurface/plLayerBink.h"
#endif
// So we can do image searches in our local age
#include "../plNetClient/plNetClientMgr.h"
@ -1000,8 +1002,10 @@ void pfBookData::IFinishTriggeredFlip(hsBool wasBackwards)
if (fCurrBook)
{
fCurrBook->IRenderPage(fCurrBook->fCurrentPage, pfJournalDlgProc::kTagLeftDTMap);
#ifdef USE_BINK_SDK
// move the videos over
fCurrBook->IMoveMovies(PageMaterial(kTurnFrontPage),PageMaterial(kRightPage));
#endif // USE_BINK_SDK
}
}
else
@ -1022,8 +1026,10 @@ void pfBookData::IFinishTriggeredFlip(hsBool wasBackwards)
if (fCurrBook)
{
fCurrBook->IRenderPage(fCurrBook->fCurrentPage + 1, pfJournalDlgProc::kTagRightDTMap);
#ifdef USE_BINK_SDK
// move the videos over
fCurrBook->IMoveMovies(PageMaterial(kTurnBackPage),PageMaterial(kLeftPage));
#endif // USE_BINK_SDK
}
}
@ -1324,6 +1330,7 @@ void pfJournalBook::Show( hsBool startOpened /*= false */)
if (decal != nil)
layers.Append(IMakeDecalLayer(fCoverDecals[i],decal,mip));
}
#ifdef USE_BINK_SDK
else
{
// it's a cover movie, not a decal, so we make a layer, thinking it's at 0,0 and a left map (which gives us the results we want)
@ -1335,6 +1342,7 @@ void pfJournalBook::Show( hsBool startOpened /*= false */)
layers.Append(plLayerInterface::ConvertNoRef(movieLayer));
fVisibleLinks.Reset(); // remove any links that the make movie layer might have added, since a cover movie can't link
}
#endif
}
ISetDecalLayers(cover,layers);
}
@ -1394,6 +1402,7 @@ void pfJournalBook::Hide( void )
// purge the dynaTextMaps, we're done with them for now
IPurgeDynaTextMaps();
// nuke the movies so they don't stay in memory (they're big!)
#ifdef USE_BINK_SDK
int i;
for( i = 0; i < fLoadedMovies.GetCount(); i++ )
{
@ -1402,6 +1411,7 @@ void pfJournalBook::Hide( void )
delete fLoadedMovies[ i ];
}
fLoadedMovies.Reset();
#endif // USE_BINK_SDK
}
}
@ -1548,8 +1558,10 @@ void pfJournalBook::NextPage( void )
if( turnFront->GetDeviceRef() != nil )
turnFront->GetDeviceRef()->SetDirty( true );
}
#ifdef USE_BINK_SDK
// copy the videos over
IMoveMovies( fBookGUIs[fCurBookGUI]->PageMaterial(pfBookData::kRightPage), fBookGUIs[fCurBookGUI]->PageMaterial(pfBookData::kTurnFrontPage) );
#endif // USE_BINK_SDK
IRenderPage( fCurrentPage, pfJournalDlgProc::kTagTurnBackDTMap );
// This will fire a callback when it's done that'll let us continue the setup
@ -1616,8 +1628,10 @@ void pfJournalBook::PreviousPage( void )
if( turnBack->GetDeviceRef() != nil )
turnBack->GetDeviceRef()->SetDirty( true );
}
#ifdef USE_BINK_SDK
// copy the videos over
IMoveMovies( fBookGUIs[fCurBookGUI]->PageMaterial(pfBookData::kLeftPage), fBookGUIs[fCurBookGUI]->PageMaterial(pfBookData::kTurnBackPage) );
#endif // USE_BINK_SDK
IRenderPage( fCurrentPage + 1, pfJournalDlgProc::kTagTurnFrontDTMap );
// This will fire a callback when it's done that'll let us continue the setup
@ -2475,6 +2489,7 @@ void pfJournalBook::IFreeSource( void )
delete fCoverDecals[ i ];
fCoverDecals.Reset();
#ifdef USE_BINK_SDK
for( i = 0; i < fLoadedMovies.GetCount(); i++ )
{
plLayerBink *movie = fLoadedMovies[ i ]->movieLayer;
@ -2482,6 +2497,7 @@ void pfJournalBook::IFreeSource( void )
delete fLoadedMovies[ i ];
}
fLoadedMovies.Reset();
#endif // USE_BINK_SDK
}
//// IGetMipmapKey ///////////////////////////////////////////////////////////
@ -2584,6 +2600,7 @@ void pfJournalBook::IRenderPage( UInt32 page, UInt32 whichDTMap, hsBool suppress
else if (whichDTMap == pfJournalDlgProc::kTagTurnBackDTMap)
material = fBookGUIs[fCurBookGUI]->PageMaterial(pfBookData::kTurnBackPage);
#ifdef USE_BINK_SDK
if (material)
{
// clear any exiting layers (movies) from the material
@ -2599,6 +2616,7 @@ void pfJournalBook::IRenderPage( UInt32 page, UInt32 whichDTMap, hsBool suppress
}
}
}
#endif // USE_BINK_SDK
hsAssert(page < fPageStarts.GetCount() || page > fLastPage, "UnInitialized page start!");
if( page <= fLastPage
@ -2786,6 +2804,7 @@ void pfJournalBook::IRenderPage( UInt32 page, UInt32 whichDTMap, hsBool suppress
break;
case pfEsHTMLChunk::kMovie:
#ifdef USE_BINK_SDK
movieAlreadyLoaded = (IMovieAlreadyLoaded(chunk) != nil); // have we already cached it?
plLayerBink *movieLayer = IMakeMovieLayer(chunk, x, y, (plMipmap*)dtMap, whichDTMap, suppressRendering);
if (movieLayer)
@ -2826,6 +2845,7 @@ void pfJournalBook::IRenderPage( UInt32 page, UInt32 whichDTMap, hsBool suppress
if (material && !suppressRendering)
material->AddLayerViaNotify(movieLayer);
}
#endif // USE_BINK_SDK
break;
}
}
@ -2850,6 +2870,7 @@ void pfJournalBook::IRenderPage( UInt32 page, UInt32 whichDTMap, hsBool suppress
//// IMoveMovies /////////////////////////////////////////////////////////////
#ifdef USE_BINK_SDK
void pfJournalBook::IMoveMovies( hsGMaterial *source, hsGMaterial *dest )
{
hsTArray<plLayerBink*> moviesOnPage;
@ -2886,6 +2907,7 @@ void pfJournalBook::IMoveMovies( hsGMaterial *source, hsGMaterial *dest )
}
}
}
#endif // USE_BINK_SDK
//// IDrawMipmap /////////////////////////////////////////////////////////////
@ -2983,6 +3005,7 @@ void pfJournalBook::IDrawMipmap( pfEsHTMLChunk *chunk, UInt16 x, UInt16 y, plMip
delete copy;
}
#ifdef USE_BINK_SDK
pfJournalBook::loadedMovie *pfJournalBook::IMovieAlreadyLoaded(pfEsHTMLChunk *chunk)
{
int i;
@ -2993,15 +3016,19 @@ pfJournalBook::loadedMovie *pfJournalBook::IMovieAlreadyLoaded(pfEsHTMLChunk *ch
}
return nil;
}
#endif // USE_BINK_SDK
plKey pfJournalBook::GetMovie(UInt8 index)
{
#ifdef USE_BINK_SDK
loadedMovie *movie = IGetMovieByIndex(index);
if (movie)
return movie->movieLayer->GetKey();
#endif // USE_BINK_SDK
return plKey(nil);
}
#ifdef USE_BINK_SDK
pfJournalBook::loadedMovie *pfJournalBook::IGetMovieByIndex(UInt8 index)
{
int i;
@ -3012,7 +3039,9 @@ pfJournalBook::loadedMovie *pfJournalBook::IGetMovieByIndex(UInt8 index)
}
return nil;
}
#endif // USE_BINK_SDK
#ifdef USE_BINK_SDK
plLayerBink *pfJournalBook::IMakeMovieLayer(pfEsHTMLChunk *chunk, UInt16 x, UInt16 y, plMipmap *baseMipmap, UInt32 whichDTMap, hsBool dontRender)
{
// see if it's already loaded
@ -3175,6 +3204,7 @@ plLayerBink *pfJournalBook::IMakeMovieLayer(pfEsHTMLChunk *chunk, UInt16 x, UInt
return movieLayer;
}
#endif // USE_BINK_SDK
plLayerInterface *pfJournalBook::IMakeBaseLayer(plMipmap *image)
{

4
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.h
View File

@ -528,8 +528,10 @@ class pfJournalBook : public hsKeyedObject
// Renders one (1) page into the given DTMap
void IRenderPage( UInt32 page, UInt32 whichDTMap, hsBool suppressRendering = false );
#ifdef USE_BINK_SDK
// moves the movie layers from one material onto another
void IMoveMovies( hsGMaterial *source, hsGMaterial *dest);
#endif
// Starting at the given chunk, works backwards to determine the full set of current
// font properties at that point, or assigns defaults if none were specified
@ -570,9 +572,11 @@ class pfJournalBook : public hsKeyedObject
void IDrawMipmap( pfEsHTMLChunk *chunk, UInt16 x, UInt16 y, plMipmap *mip, plDynamicTextMap *dtMap, UInt32 whichDTMap, hsBool dontRender );
// Movie functions
#ifdef USE_BINK_SDK
loadedMovie *IMovieAlreadyLoaded(pfEsHTMLChunk *chunk);
loadedMovie *IGetMovieByIndex(UInt8 index);
plLayerBink *IMakeMovieLayer(pfEsHTMLChunk *chunk, UInt16 x, UInt16 y, plMipmap *baseMipmap, UInt32 whichDTMap, hsBool dontRender);
#endif
// Cover functions
plLayerInterface *IMakeBaseLayer(plMipmap *image);

2
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/cyPythonInterface.cpp
View File

@ -129,8 +129,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
// audio setting stuff
#include "pyAudioControl.h"
#ifdef PLASMA_CCR_RELEASE
//CCR stufff
#include "pyCCRMgr.h"
#endif // PLASMA_CCR_RELEASE
// spawn point def
#include "pySpawnPointInfo.h"

11
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/pyCCRMgr.cpp
View File

@ -39,11 +39,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
Mead, WA 99021
*==LICENSE==*/
//////////////////////////////////////////////////////////////////////
//
// pyCCRMgr - a wrapper class to provide interface to the pfCCR stuff
//
//////////////////////////////////////////////////////////////////////
#include "../pfCCR/plCCRMgr.h"
#ifdef PLASMA_CCR_RELEASE
#error Adjust this to where the real pyCCRMgr.cpp lives and submit a pull request!
#include "pyCCRMgrReal.cpp"
#endif // PLASMA_CCR_RELEASE

7
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/pyCCRMgrGlue.cpp
View File

@ -39,7 +39,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
Mead, WA 99021
*==LICENSE==*/
#include "pyCCRMgr.h"
#include "pyAgeLinkStruct.h"
#include <python.h>
#ifdef PLASMA_CCR_RELEASE
#error Adjust this to where the real pyCCRMgrGlue.cpp lives and submit a pull request!
#include "pyCCRMgrGlueReal.cpp"
#endif // PLASMA_CCR_RELEASE

6
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/pyCCRMgrGlue2.cpp
View File

@ -39,6 +39,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
Mead, WA 99021
*==LICENSE==*/
#include "pyCCRMgr.h"
#include <python.h>
#ifdef PLASMA_CCR_RELEASE
#error Adjust this to where the real pyCCRMgrGlue2.cpp lives and submit a pull request!
#include "pyCCRMgrGlue2Real.cpp"
#endif // PLASMA_CCR_RELEASE

6
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/pyDynamicTextGlue.cpp
View File

@ -491,4 +491,10 @@ void pyDynamicText::AddPlasmaConstantsClasses(PyObject *m)
PYTHON_ENUM_ELEMENT(PtJustify, kLeftJustify, plDynamicTextMap::Justify::kLeftJustify);
PYTHON_ENUM_ELEMENT(PtJustify, kRightJustify, plDynamicTextMap::Justify::kRightJustify);
PYTHON_ENUM_END(m, PtJustify);
PYTHON_ENUM_START(PtFontFlags);
PYTHON_ENUM_ELEMENT(PtFontFlags, kFontBold, plDynamicTextMap::kFontBold);
PYTHON_ENUM_ELEMENT(PtFontFlags, kFontItalic, plDynamicTextMap::kFontItalic);
PYTHON_ENUM_ELEMENT(PtFontFlags, kFontShadowed, plDynamicTextMap::kFontShadowed);
PYTHON_ENUM_END(m, PtFontFlags);
}

41
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.cpp
View File

@ -278,7 +278,7 @@ PyObject* pyGUIControl::GetOwnerDlg( void )
}
// get color schemes
PyObject* pyGUIControl::GetForeColor()
PyObject* pyGUIControl::GetForeColor() const
{
if ( fGCkey )
{
@ -292,7 +292,7 @@ PyObject* pyGUIControl::GetForeColor()
PYTHON_RETURN_NONE;
}
PyObject* pyGUIControl::GetSelColor()
PyObject* pyGUIControl::GetSelColor() const
{
if ( fGCkey )
{
@ -306,7 +306,7 @@ PyObject* pyGUIControl::GetSelColor()
PYTHON_RETURN_NONE;
}
PyObject* pyGUIControl::GetBackColor()
PyObject* pyGUIControl::GetBackColor() const
{
if ( fGCkey )
{
@ -320,7 +320,7 @@ PyObject* pyGUIControl::GetBackColor()
PYTHON_RETURN_NONE;
}
PyObject* pyGUIControl::GetBackSelColor()
PyObject* pyGUIControl::GetBackSelColor() const
{
if ( fGCkey )
{
@ -334,7 +334,7 @@ PyObject* pyGUIControl::GetBackSelColor()
PYTHON_RETURN_NONE;
}
UInt32 pyGUIControl::GetFontSize()
UInt32 pyGUIControl::GetFontSize() const
{
if ( fGCkey )
{
@ -444,3 +444,34 @@ void pyGUIControl::SetFontSize(UInt32 fontsize)
}
}
}
void pyGUIControl::SetFontFlags(UInt8 fontFlags)
{
if (fGCkey)
{
// get the pointer to the modifier
pfGUIControlMod* pdmod = pfGUIControlMod::ConvertNoRef(fGCkey->ObjectIsLoaded());
if (pdmod)
{
pfGUIColorScheme* colorscheme = pdmod->GetColorScheme();
colorscheme->fFontFlags = fontFlags;
pdmod->UpdateColorScheme();
}
}
}
UInt8 pyGUIControl::GetFontFlags() const
{
if (fGCkey)
{
// get the pointer to the modifier
pfGUIControlMod* pdmod = pfGUIControlMod::ConvertNoRef(fGCkey->ObjectIsLoaded());
if (pdmod)
{
pfGUIColorScheme* colorscheme = pdmod->GetColorScheme();
return colorscheme->fFontFlags;
}
}
return 0;
}

12
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/pyGUIControl.h
View File

@ -116,17 +116,19 @@ public:
virtual PyObject* GetOwnerDlg( void ); // returns pyGUIDialog
// get color schemes
virtual PyObject* GetForeColor(); // returns pyColor
virtual PyObject* GetSelColor(); // returns pyColor
virtual PyObject* GetBackColor(); // returns pyColor
virtual PyObject* GetBackSelColor(); // returns pyColor
virtual UInt32 GetFontSize();
virtual PyObject* GetForeColor() const; // returns pyColor
virtual PyObject* GetSelColor() const; // returns pyColor
virtual PyObject* GetBackColor() const; // returns pyColor
virtual PyObject* GetBackSelColor() const; // returns pyColor
virtual UInt32 GetFontSize() const;
virtual UInt8 GetFontFlags() const;
// set color scheme
virtual void SetForeColor( hsScalar r, hsScalar g, hsScalar b, hsScalar a );
virtual void SetSelColor( hsScalar r, hsScalar g, hsScalar b, hsScalar a );
virtual void SetBackColor( hsScalar r, hsScalar g, hsScalar b, hsScalar a );
virtual void SetBackSelColor( hsScalar r, hsScalar g, hsScalar b, hsScalar a );
virtual void SetFontSize(UInt32 fontsize);
virtual void SetFontFlags(UInt8 fontflags);
};

19
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/pyGUIControlGlue.cpp
View File

@ -244,6 +244,23 @@ PYTHON_METHOD_DEFINITION_NOARGS(ptGUIControl, getFontSize)
return PyLong_FromUnsignedLong(self->fThis->GetFontSize());
}
PYTHON_METHOD_DEFINITION_NOARGS(ptGUIControl, getFontFlags)
{
return PyInt_FromLong(self->fThis->GetFontFlags());
}
PYTHON_METHOD_DEFINITION(ptGUIControl, setFontFlags, args)
{
unsigned char fontflags;
if (!PyArg_ParseTuple(args, "b", &fontflags))
{
PyErr_SetString(PyExc_TypeError, "setFontFlags expects an unsigned 8-bit int");
PYTHON_RETURN_ERROR;
}
self->fThis->SetFontFlags(fontflags);
PYTHON_RETURN_NONE;
}
PYTHON_METHOD_DEFINITION(ptGUIControl, setForeColor, args)
{
float r, g, b, a;
@ -329,11 +346,13 @@ PYTHON_START_METHODS_TABLE(ptGUIControl)
PYTHON_METHOD_NOARGS(ptGUIControl, getBackColor, "Returns the background color"),
PYTHON_METHOD_NOARGS(ptGUIControl, getBackSelectColor, "Returns the background selection color"),
PYTHON_METHOD_NOARGS(ptGUIControl, getFontSize, "Returns the font size"),
PYTHON_METHOD_NOARGS(ptGUIControl, getFontFlags, "Returns the current fontflags"),
PYTHON_METHOD(ptGUIControl, setForeColor, "Params: r,g,b,a\nSets the foreground color"),
PYTHON_METHOD(ptGUIControl, setSelectColor, "Params: r,g,b,a\nSets the selection color"),
PYTHON_METHOD(ptGUIControl, setBackColor, "Params: r,g,b,a\nSets the background color"),
PYTHON_METHOD(ptGUIControl, setBackSelectColor, "Params: r,g,b,a\nSets the selection background color"),
PYTHON_METHOD(ptGUIControl, setFontSize, "Params: fontSize\nSets the font size"),
PYTHON_METHOD(ptGUIControl, setFontFlags, "Params: fontflags\nSets current fontflags"),
PYTHON_END_METHODS_TABLE;
// Type structure definition

26
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEdit.cpp
View File

@ -80,6 +80,30 @@ void pyGUIControlMultiLineEdit::SetScrollPosition( Int32 topLine )
}
}
Int32 pyGUIControlMultiLineEdit::GetScrollPosition()
{
if ( fGCkey )
{
// get the pointer to the modifier
pfGUIMultiLineEditCtrl* pbmod = pfGUIMultiLineEditCtrl::ConvertNoRef(fGCkey->ObjectIsLoaded());
if ( pbmod )
return pbmod->GetScrollPosition();
}
return 0;
}
hsBool pyGUIControlMultiLineEdit::IsAtEnd()
{
if ( fGCkey )
{
// get the pointer to the modifier
pfGUIMultiLineEditCtrl* pbmod = pfGUIMultiLineEditCtrl::ConvertNoRef(fGCkey->ObjectIsLoaded());
if ( pbmod )
return pbmod->ShowingEndOfBuffer();
}
return false;
}
void pyGUIControlMultiLineEdit::MoveCursor( Int32 dir)
{
if ( fGCkey )
@ -557,4 +581,4 @@ void pyGUIControlMultiLineEdit::SetFontSize( UInt32 fontsize )
if ( pbmod )
pbmod->SetFontSize((UInt8)fontsize);
}
}
}

2
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEdit.h
View File

@ -80,6 +80,8 @@ public:
virtual void Clickable( void );
virtual void Unclickable( void );
virtual void SetScrollPosition( Int32 topLine );
virtual Int32 GetScrollPosition();
virtual hsBool IsAtEnd();
virtual void MoveCursor( Int32 dir );
virtual void ClearBuffer( void );
virtual void SetText( const char *asciiText );

12
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEditGlue.cpp
View File

@ -87,6 +87,16 @@ PYTHON_METHOD_DEFINITION(ptGUIControlMultiLineEdit, setScrollPosition, args)
PYTHON_RETURN_NONE;
}
PYTHON_METHOD_DEFINITION_NOARGS(ptGUIControlMultiLineEdit, getScrollPosition)
{
return PyLong_FromLong(self->fThis->GetScrollPosition());
}
PYTHON_METHOD_DEFINITION_NOARGS(ptGUIControlMultiLineEdit, isAtEnd)
{
PYTHON_RETURN_BOOL(self->fThis->IsAtEnd());
}
PYTHON_METHOD_DEFINITION(ptGUIControlMultiLineEdit, moveCursor, args)
{
long dir;
@ -394,6 +404,8 @@ PYTHON_START_METHODS_TABLE(ptGUIControlMultiLineEdit)
PYTHON_BASIC_METHOD(ptGUIControlMultiLineEdit, unclickable, "Makes this listbox not clickable by the user.\n"
"Useful when just displaying a list that is not really selectable."),
PYTHON_METHOD(ptGUIControlMultiLineEdit, setScrollPosition, "Params: topLine\nSets the what line is the top line."),
PYTHON_METHOD_NOARGS(ptGUIControlMultiLineEdit, getScrollPosition, "Gets what line is the top line."),
PYTHON_METHOD_NOARGS(ptGUIControlMultiLineEdit, isAtEnd, "Returns true if the end of the buffer has been reached."),
PYTHON_METHOD(ptGUIControlMultiLineEdit, moveCursor, "Params: direction\nMove the cursor in the specified direction (see PtGUIMultiLineDirection)"),
PYTHON_BASIC_METHOD(ptGUIControlMultiLineEdit, clearBuffer, "Clears all text from the multi-line edit control."),
PYTHON_METHOD(ptGUIControlMultiLineEdit, setString, "Params: asciiText\nSets the multi-line edit control string."),

1
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBox.cpp
View File

@ -214,3 +214,4 @@ UInt8 pyGUIControlTextBox::GetJustify()
}
return pfGUIListText::kLeftJustify;
}

1
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBox.h
View File

@ -88,6 +88,7 @@ public:
virtual void SetForeColor( pyColor& color );
virtual void SetBackColor( pyColor& color );
virtual void SetJustify( UInt8 justify );
virtual UInt8 GetJustify();
virtual PyObject* GetForeColor(); // returns pyColor
};

2
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBoxGlue.cpp
View File

@ -185,6 +185,8 @@ PYTHON_METHOD_DEFINITION(ptGUIControlTextBox, setStringJustify, args)
PYTHON_RETURN_NONE;
}
PYTHON_METHOD_DEFINITION_NOARGS(ptGUIControlTextBox, getStringJustify)
{
return PyInt_FromLong(self->fThis->GetJustify());

2
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/pySceneObject.cpp
View File

@ -545,7 +545,7 @@ hsBool pySceneObject::IsAvatar()
return false;
}
#include "../plAvatar/plAvCallbackAction.h"
#include "../plAvatar/plPhysicalControllerCore.h"
PyObject* pySceneObject::GetAvatarVelocity()
{

5
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/pyVault.cpp
View File

@ -664,6 +664,11 @@ bool pyVault::SetAgePublic( const pyAgeInfoStruct * ageInfo, bool makePublic )
return VaultSetOwnedAgePublicAndWait(ageInfo->GetAgeInfo(), makePublic);
}
bool pyVault::SetAgePublic( const pyVaultAgeInfoNode * ageInfoNode, bool makePublic )
{
return VaultSetAgePublicAndWait(ageInfoNode->GetNode(), makePublic);
}
PyObject* pyVault::GetGlobalInbox( void )
{

2
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/pyVault.h
View File

@ -176,6 +176,8 @@ public:
void CreateNeighborhood();
// set an age's public status. will fail if you aren't czar of age.
bool SetAgePublic( const pyAgeInfoStruct * ageInfo, bool makePublic );
// set an age's public status, also works for non-owners
bool SetAgePublic( const pyVaultAgeInfoNode * ageInfoNode, bool makePublic );
PyObject* GetGlobalInbox( void ); // returns pyVaultFolderNode
#ifdef GlobalInboxTestCode

18
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/pyVaultGlue.cpp
View File

@ -43,6 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pyEnum.h"
#include "pyAgeInfoStruct.h"
#include "pyVaultNode.h"
#include "pyVaultAgeInfoNode.h"
#include "pySDL.h"
#include "pyAgeLinkStruct.h"
@ -451,16 +452,21 @@ PYTHON_METHOD_DEFINITION(ptVault, setAgePublic, args)
char makePublic;
if (!PyArg_ParseTuple(args, "Ob", &ageInfoObj, &makePublic))
{
PyErr_SetString(PyExc_TypeError, "setAgePublic expects a ptAgeInfoStruct and a boolean");
PyErr_SetString(PyExc_TypeError, "setAgePublic expects a ptAgeInfoStruct or ptVaultAgeInfoNode and a boolean");
PYTHON_RETURN_ERROR;
}
if (!pyAgeInfoStruct::Check(ageInfoObj))
if (pyAgeInfoStruct::Check(ageInfoObj))
{
PyErr_SetString(PyExc_TypeError, "setAgePublic expects a ptAgeInfoStruct and a boolean");
PYTHON_RETURN_ERROR;
pyAgeInfoStruct* ageInfo = pyAgeInfoStruct::ConvertFrom(ageInfoObj);
PYTHON_RETURN_BOOL(self->fThis->SetAgePublic(ageInfo, makePublic != 0));
}
pyAgeInfoStruct* ageInfo = pyAgeInfoStruct::ConvertFrom(ageInfoObj);
PYTHON_RETURN_BOOL(self->fThis->SetAgePublic(ageInfo, makePublic != 0));
else if (pyVaultAgeInfoNode::Check(ageInfoObj))
{
pyVaultAgeInfoNode* ageInfoNode = pyVaultAgeInfoNode::ConvertFrom(ageInfoObj);
PYTHON_RETURN_BOOL(self->fThis->SetAgePublic(ageInfoNode, makePublic != 0));
}
PyErr_SetString(PyExc_TypeError, "setAgePublic expects a ptAgeInfoStruct or ptVaultAgeInfoNode and a boolean");
PYTHON_RETURN_ERROR;
}
PYTHON_START_METHODS_TABLE(ptVault)

2
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfSurface/pfSurfaceCreatable.h
View File

@ -49,9 +49,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
REGISTER_NONCREATABLE( plLayerMovie );
#ifdef USE_BINK_SDK
#include "plLayerBink.h"
REGISTER_CREATABLE( plLayerBink );
#endif
#include "plLayerAVI.h"

3
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/inc/hsGMatState.h
View File

@ -85,7 +85,8 @@ enum hsGMatBlendFlags {
kBlendEnvBumpNext = 0x800000,
kBlendSubtract = 0x1000000,
kBlendRevSubtract = 0x2000000,
kBlendAlphaTestHigh = 0x4000000
kBlendAlphaTestHigh = 0x4000000,
kBlendAlphaPremultiplied = 0x8000000
};
enum hsGMatClampFlags {

8
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCore/Private/pnAcLog.cpp
View File

@ -166,7 +166,7 @@ void LogMsgV (ELogSeverity severity, const wchar format[], va_list args) {
}
//============================================================================
#ifdef HS_DEBUGGING
//#ifdef HS_DEBUGGING
void LogMsgDebug (const char format[], ...) {
ASSERT(format);
@ -175,10 +175,10 @@ void LogMsgDebug (const char format[], ...) {
LogMsgV(kLogDebug, format, args);
va_end(args);
}
#endif
//#endif
//============================================================================
#ifdef HS_DEBUGGING
//#ifdef HS_DEBUGGING
void LogMsgDebug (const wchar format[], ...) {
ASSERT(format);
@ -187,4 +187,4 @@ void LogMsgDebug (const wchar format[], ...) {
LogMsgV(kLogDebug, format, args);
va_end(args);
}
#endif
//#endif

Some files were not shown because too many files have changed in this diff Show More