Merge pull request #65 from mparisi20/master

Reorganize code with /GameSpy library

52 files changed, 52 insertions, 52 deletions

diff --git a/Makefile b/Makefile
index d1c3561..8092892 100644
--- a/Makefile
+++ b/Makefile
@@ -28,8 +28,8 @@ TARGET := pbr_pal
 
 BUILD_DIR := build/$(TARGET)
 
-SRC_DIRS := src src/SDK/OS src/libstdc++
-ASM_DIRS := asm asm/SDK/OS asm/libstdc++ asm/MetroTRK
+SRC_DIRS := src src/SDK/OS src/libstdc++ src/MetroTRK src/GameSpy
+ASM_DIRS := asm asm/SDK/OS asm/libstdc++ asm/MetroTRK asm/GameSpy
 
 # Inputs
 S_FILES := $(wildcard asm/*.s)
diff --git a/asm/NATify.s b/asm/GameSpy/NATify.s
index ea73019..ea73019 100644
--- a/asm/NATify.s
+++ b/asm/GameSpy/NATify.s
diff --git a/asm/gbucket.s b/asm/GameSpy/gbucket.s
index 2449fac..2449fac 100644
--- a/asm/gbucket.s
+++ b/asm/GameSpy/gbucket.s
diff --git a/asm/ghttpBuffer.s b/asm/GameSpy/ghttpBuffer.s
index 3dff221..3dff221 100644
--- a/asm/ghttpBuffer.s
+++ b/asm/GameSpy/ghttpBuffer.s
diff --git a/asm/ghttpCallbacks.s b/asm/GameSpy/ghttpCallbacks.s
index 47dc2d6..47dc2d6 100644
--- a/asm/ghttpCallbacks.s
+++ b/asm/GameSpy/ghttpCallbacks.s
diff --git a/asm/ghttpCommon.s b/asm/GameSpy/ghttpCommon.s
index f6b8d38..f6b8d38 100644
--- a/asm/ghttpCommon.s
+++ b/asm/GameSpy/ghttpCommon.s
diff --git a/asm/ghttpConnection.s b/asm/GameSpy/ghttpConnection.s
index 0e042c5..0e042c5 100644
--- a/asm/ghttpConnection.s
+++ b/asm/GameSpy/ghttpConnection.s
diff --git a/asm/ghttpEncryption.s b/asm/GameSpy/ghttpEncryption.s
index 20e2fa3..20e2fa3 100644
--- a/asm/ghttpEncryption.s
+++ b/asm/GameSpy/ghttpEncryption.s
diff --git a/asm/ghttpMain.s b/asm/GameSpy/ghttpMain.s
index 15cdb47..15cdb47 100644
--- a/asm/ghttpMain.s
+++ b/asm/GameSpy/ghttpMain.s
diff --git a/asm/ghttpPost.s b/asm/GameSpy/ghttpPost.s
index 0d74a4e..0d74a4e 100644
--- a/asm/ghttpPost.s
+++ b/asm/GameSpy/ghttpPost.s
diff --git a/asm/ghttpProcess.s b/asm/GameSpy/ghttpProcess.s
index 9322ac2..9322ac2 100644
--- a/asm/ghttpProcess.s
+++ b/asm/GameSpy/ghttpProcess.s
diff --git a/asm/gp.s b/asm/GameSpy/gp.s
index 24ca89c..24ca89c 100644
--- a/asm/gp.s
+++ b/asm/GameSpy/gp.s
diff --git a/asm/gpi.s b/asm/GameSpy/gpi.s
index 53e82bc..53e82bc 100644
--- a/asm/gpi.s
+++ b/asm/GameSpy/gpi.s
diff --git a/asm/gpiBuddy.s b/asm/GameSpy/gpiBuddy.s
index 8c40312..8c40312 100644
--- a/asm/gpiBuddy.s
+++ b/asm/GameSpy/gpiBuddy.s
diff --git a/asm/gpiBuffer.s b/asm/GameSpy/gpiBuffer.s
index abeaec4..abeaec4 100644
--- a/asm/gpiBuffer.s
+++ b/asm/GameSpy/gpiBuffer.s
diff --git a/asm/gpiCallback.s b/asm/GameSpy/gpiCallback.s
index 0d576f3..0d576f3 100644
--- a/asm/gpiCallback.s
+++ b/asm/GameSpy/gpiCallback.s
diff --git a/asm/gpiConnect.s b/asm/GameSpy/gpiConnect.s
index 9033c19..9033c19 100644
--- a/asm/gpiConnect.s
+++ b/asm/GameSpy/gpiConnect.s
diff --git a/asm/gpiInfo.s b/asm/GameSpy/gpiInfo.s
index d7096bb..d7096bb 100644
--- a/asm/gpiInfo.s
+++ b/asm/GameSpy/gpiInfo.s
diff --git a/asm/gpiOperation.s b/asm/GameSpy/gpiOperation.s
index 8c6ee78..8c6ee78 100644
--- a/asm/gpiOperation.s
+++ b/asm/GameSpy/gpiOperation.s
diff --git a/asm/gpiPeer.s b/asm/GameSpy/gpiPeer.s
index 2851a5f..2851a5f 100644
--- a/asm/gpiPeer.s
+++ b/asm/GameSpy/gpiPeer.s
diff --git a/asm/gpiProfile.s b/asm/GameSpy/gpiProfile.s
index 50169e2..50169e2 100644
--- a/asm/gpiProfile.s
+++ b/asm/GameSpy/gpiProfile.s
diff --git a/asm/gpiSearch.s b/asm/GameSpy/gpiSearch.s
index 4f5b866..4f5b866 100644
--- a/asm/gpiSearch.s
+++ b/asm/GameSpy/gpiSearch.s
diff --git a/asm/gpiTransfer.s b/asm/GameSpy/gpiTransfer.s
index 8219725..8219725 100644
--- a/asm/gpiTransfer.s
+++ b/asm/GameSpy/gpiTransfer.s
diff --git a/asm/gpiUnique.s b/asm/GameSpy/gpiUnique.s
index 00a887e..00a887e 100644
--- a/asm/gpiUnique.s
+++ b/asm/GameSpy/gpiUnique.s
diff --git a/asm/gpiUtility.s b/asm/GameSpy/gpiUtility.s
index 3b6f171..3b6f171 100644
--- a/asm/gpiUtility.s
+++ b/asm/GameSpy/gpiUtility.s
diff --git a/asm/gsAvailable.s b/asm/GameSpy/gsAvailable.s
index a459f25..a459f25 100644
--- a/asm/gsAvailable.s
+++ b/asm/GameSpy/gsAvailable.s
diff --git a/asm/gsCrypt.s b/asm/GameSpy/gsCrypt.s
index 24f99c9..24f99c9 100644
--- a/asm/gsCrypt.s
+++ b/asm/GameSpy/gsCrypt.s
diff --git a/asm/gsLargeInt.s b/asm/GameSpy/gsLargeInt.s
index f796161..f796161 100644
--- a/asm/gsLargeInt.s
+++ b/asm/GameSpy/gsLargeInt.s
diff --git a/asm/gsRC4.s b/asm/GameSpy/gsRC4.s
index 2e1fad3..2e1fad3 100644
--- a/asm/gsRC4.s
+++ b/asm/GameSpy/gsRC4.s
diff --git a/asm/gsSHA1.s b/asm/GameSpy/gsSHA1.s
index 48f2f4e..48f2f4e 100644
--- a/asm/gsSHA1.s
+++ b/asm/GameSpy/gsSHA1.s
diff --git a/asm/gsXML.s b/asm/GameSpy/gsXML.s
index 288b366..288b366 100644
--- a/asm/gsXML.s
+++ b/asm/GameSpy/gsXML.s
diff --git a/asm/gstats.s b/asm/GameSpy/gstats.s
index bce424a..bce424a 100644
--- a/asm/gstats.s
+++ b/asm/GameSpy/gstats.s
diff --git a/asm/gt2Auth.s b/asm/GameSpy/gt2Auth.s
index f8adaff..f8adaff 100644
--- a/asm/gt2Auth.s
+++ b/asm/GameSpy/gt2Auth.s
diff --git a/asm/gt2Buffer.s b/asm/GameSpy/gt2Buffer.s
index ab6397e..ab6397e 100644
--- a/asm/gt2Buffer.s
+++ b/asm/GameSpy/gt2Buffer.s
diff --git a/asm/gt2Callback.s b/asm/GameSpy/gt2Callback.s
index fbb959a..fbb959a 100644
--- a/asm/gt2Callback.s
+++ b/asm/GameSpy/gt2Callback.s
diff --git a/asm/gt2Connection.s b/asm/GameSpy/gt2Connection.s
index 878a4a4..878a4a4 100644
--- a/asm/gt2Connection.s
+++ b/asm/GameSpy/gt2Connection.s
diff --git a/asm/gt2Main.s b/asm/GameSpy/gt2Main.s
index cc9ab4a..cc9ab4a 100644
--- a/asm/gt2Main.s
+++ b/asm/GameSpy/gt2Main.s
diff --git a/asm/gt2Message.s b/asm/GameSpy/gt2Message.s
index 437b546..437b546 100644
--- a/asm/gt2Message.s
+++ b/asm/GameSpy/gt2Message.s
diff --git a/asm/gt2Socket.s b/asm/GameSpy/gt2Socket.s
index 8cad7b1..8cad7b1 100644
--- a/asm/gt2Socket.s
+++ b/asm/GameSpy/gt2Socket.s
diff --git a/asm/gt2Utility.s b/asm/GameSpy/gt2Utility.s
index e09ab92..e09ab92 100644
--- a/asm/gt2Utility.s
+++ b/asm/GameSpy/gt2Utility.s
diff --git a/asm/md5c.s b/asm/GameSpy/md5c.s
index 8424c1b..8424c1b 100644
--- a/asm/md5c.s
+++ b/asm/GameSpy/md5c.s
diff --git a/asm/natneg.s b/asm/GameSpy/natneg.s
index 01a051e..01a051e 100644
--- a/asm/natneg.s
+++ b/asm/GameSpy/natneg.s
diff --git a/asm/nonport.s b/asm/GameSpy/nonport.s
index c76e184..c76e184 100644
--- a/asm/nonport.s
+++ b/asm/GameSpy/nonport.s
diff --git a/asm/qr2.s b/asm/GameSpy/qr2.s
index b6bc276..b6bc276 100644
--- a/asm/qr2.s
+++ b/asm/GameSpy/qr2.s
diff --git a/asm/qr2regkeys.s b/asm/GameSpy/qr2regkeys.s
index 8e8f896..8e8f896 100644
--- a/asm/qr2regkeys.s
+++ b/asm/GameSpy/qr2regkeys.s
diff --git a/asm/sb_crypt.s b/asm/GameSpy/sb_crypt.s
index ebda0e7..ebda0e7 100644
--- a/asm/sb_crypt.s
+++ b/asm/GameSpy/sb_crypt.s
diff --git a/asm/sb_queryengine.s b/asm/GameSpy/sb_queryengine.s
index 59269b8..59269b8 100644
--- a/asm/sb_queryengine.s
+++ b/asm/GameSpy/sb_queryengine.s
diff --git a/asm/sb_server.s b/asm/GameSpy/sb_server.s
index 3a2ae29..3a2ae29 100644
--- a/asm/sb_server.s
+++ b/asm/GameSpy/sb_server.s
diff --git a/asm/sb_serverbrowsing.s b/asm/GameSpy/sb_serverbrowsing.s
index 5b40e05..5b40e05 100644
--- a/asm/sb_serverbrowsing.s
+++ b/asm/GameSpy/sb_serverbrowsing.s
diff --git a/obj_files.mk b/obj_files.mk
index 5c42ca5..31423d5 100644
--- a/obj_files.mk
+++ b/obj_files.mk
@@ -38,56 +38,56 @@ TEXT_O_FILES := 						                          \
 	$(BUILD_DIR)/asm/text_8.o                                     \
 	$(BUILD_DIR)/asm/text_9.o                                     \
 	$(BUILD_DIR)/asm/text_10.o                                    \
-	$(BUILD_DIR)/src/darray.o                                     \
-	$(BUILD_DIR)/src/hashtable.o                                  \
-	$(BUILD_DIR)/asm/md5c.o                                       \
-	$(BUILD_DIR)/asm/nonport.o                                    \
-	$(BUILD_DIR)/asm/gsAvailable.o                                \
-	$(BUILD_DIR)/asm/gsCrypt.o                                    \
-	$(BUILD_DIR)/asm/gsLargeInt.o                                 \
-	$(BUILD_DIR)/asm/gsRC4.o                                      \
-	$(BUILD_DIR)/asm/gsSHA1.o                                     \
-	$(BUILD_DIR)/asm/gsXML.o                                      \
-	$(BUILD_DIR)/asm/gp.o                                         \
-	$(BUILD_DIR)/asm/gpi.o                                        \
-	$(BUILD_DIR)/asm/gpiBuddy.o                                   \
-	$(BUILD_DIR)/asm/gpiBuffer.o                                  \
-	$(BUILD_DIR)/asm/gpiCallback.o                                \
-	$(BUILD_DIR)/asm/gpiConnect.o                                 \
-	$(BUILD_DIR)/asm/gpiInfo.o                                    \
-	$(BUILD_DIR)/asm/gpiOperation.o                               \
-	$(BUILD_DIR)/asm/gpiPeer.o                                    \
-	$(BUILD_DIR)/asm/gpiProfile.o                                 \
-	$(BUILD_DIR)/asm/gpiSearch.o                                  \
-	$(BUILD_DIR)/asm/gpiTransfer.o                                \
-	$(BUILD_DIR)/asm/gpiUnique.o                                  \
-	$(BUILD_DIR)/asm/gpiUtility.o                                 \
-	$(BUILD_DIR)/asm/gt2Auth.o                                    \
-	$(BUILD_DIR)/asm/gt2Buffer.o                                  \
-	$(BUILD_DIR)/asm/gt2Callback.o                                \
-	$(BUILD_DIR)/asm/gt2Connection.o                              \
-	$(BUILD_DIR)/asm/gt2Main.o                                    \
-	$(BUILD_DIR)/asm/gt2Message.o                                 \
-	$(BUILD_DIR)/asm/gt2Socket.o                                  \
-	$(BUILD_DIR)/asm/gt2Utility.o                                 \
-	$(BUILD_DIR)/asm/qr2.o                                        \
-	$(BUILD_DIR)/asm/qr2regkeys.o                                 \
-	$(BUILD_DIR)/asm/ghttpBuffer.o                                \
-	$(BUILD_DIR)/asm/ghttpCallbacks.o                             \
-	$(BUILD_DIR)/asm/ghttpCommon.o                                \
-	$(BUILD_DIR)/asm/ghttpConnection.o                            \
-	$(BUILD_DIR)/asm/ghttpEncryption.o                            \
-	$(BUILD_DIR)/asm/ghttpMain.o                                  \
-	$(BUILD_DIR)/asm/ghttpPost.o                                  \
-	$(BUILD_DIR)/asm/ghttpProcess.o                               \
-	$(BUILD_DIR)/asm/gbucket.o                                    \
-	$(BUILD_DIR)/asm/gstats.o                                     \
-	$(BUILD_DIR)/asm/NATify.o                                     \
-	$(BUILD_DIR)/asm/natneg.o                                     \
-	$(BUILD_DIR)/asm/sb_crypt.o                                   \
-	$(BUILD_DIR)/asm/sb_queryengine.o                             \
-	$(BUILD_DIR)/asm/sb_server.o                                  \
-	$(BUILD_DIR)/asm/sb_serverbrowsing.o                          \
+	$(BUILD_DIR)/src/GameSpy/darray.o                             \
+	$(BUILD_DIR)/src/GameSpy/hashtable.o                          \
+	$(BUILD_DIR)/asm/GameSpy/md5c.o                               \
+	$(BUILD_DIR)/asm/GameSpy/nonport.o                            \
+	$(BUILD_DIR)/asm/GameSpy/gsAvailable.o                        \
+	$(BUILD_DIR)/asm/GameSpy/gsCrypt.o                            \
+	$(BUILD_DIR)/asm/GameSpy/gsLargeInt.o                         \
+	$(BUILD_DIR)/asm/GameSpy/gsRC4.o                              \
+	$(BUILD_DIR)/asm/GameSpy/gsSHA1.o                             \
+	$(BUILD_DIR)/asm/GameSpy/gsXML.o                              \
+	$(BUILD_DIR)/asm/GameSpy/gp.o                                 \
+	$(BUILD_DIR)/asm/GameSpy/gpi.o                                \
+	$(BUILD_DIR)/asm/GameSpy/gpiBuddy.o                           \
+	$(BUILD_DIR)/asm/GameSpy/gpiBuffer.o                          \
+	$(BUILD_DIR)/asm/GameSpy/gpiCallback.o                        \
+	$(BUILD_DIR)/asm/GameSpy/gpiConnect.o                         \
+	$(BUILD_DIR)/asm/GameSpy/gpiInfo.o                            \
+	$(BUILD_DIR)/asm/GameSpy/gpiOperation.o                       \
+	$(BUILD_DIR)/asm/GameSpy/gpiPeer.o                            \
+	$(BUILD_DIR)/asm/GameSpy/gpiProfile.o                         \
+	$(BUILD_DIR)/asm/GameSpy/gpiSearch.o                          \
+	$(BUILD_DIR)/asm/GameSpy/gpiTransfer.o                        \
+	$(BUILD_DIR)/asm/GameSpy/gpiUnique.o                          \
+	$(BUILD_DIR)/asm/GameSpy/gpiUtility.o                         \
+	$(BUILD_DIR)/asm/GameSpy/gt2Auth.o                            \
+	$(BUILD_DIR)/asm/GameSpy/gt2Buffer.o                          \
+	$(BUILD_DIR)/asm/GameSpy/gt2Callback.o                        \
+	$(BUILD_DIR)/asm/GameSpy/gt2Connection.o                      \
+	$(BUILD_DIR)/asm/GameSpy/gt2Main.o                            \
+	$(BUILD_DIR)/asm/GameSpy/gt2Message.o                         \
+	$(BUILD_DIR)/asm/GameSpy/gt2Socket.o                          \
+	$(BUILD_DIR)/asm/GameSpy/gt2Utility.o                         \
+	$(BUILD_DIR)/asm/GameSpy/qr2.o                                \
+	$(BUILD_DIR)/asm/GameSpy/qr2regkeys.o                         \
+	$(BUILD_DIR)/asm/GameSpy/ghttpBuffer.o                        \
+	$(BUILD_DIR)/asm/GameSpy/ghttpCallbacks.o                     \
+	$(BUILD_DIR)/asm/GameSpy/ghttpCommon.o                        \
+	$(BUILD_DIR)/asm/GameSpy/ghttpConnection.o                    \
+	$(BUILD_DIR)/asm/GameSpy/ghttpEncryption.o                    \
+	$(BUILD_DIR)/asm/GameSpy/ghttpMain.o                          \
+	$(BUILD_DIR)/asm/GameSpy/ghttpPost.o                          \
+	$(BUILD_DIR)/asm/GameSpy/ghttpProcess.o                       \
+	$(BUILD_DIR)/asm/GameSpy/gbucket.o                            \
+	$(BUILD_DIR)/asm/GameSpy/gstats.o                             \
+	$(BUILD_DIR)/asm/GameSpy/NATify.o                             \
+	$(BUILD_DIR)/asm/GameSpy/natneg.o                             \
+	$(BUILD_DIR)/asm/GameSpy/sb_crypt.o                           \
+	$(BUILD_DIR)/asm/GameSpy/sb_queryengine.o                     \
+	$(BUILD_DIR)/asm/GameSpy/sb_server.o                          \
+	$(BUILD_DIR)/asm/GameSpy/sb_serverbrowsing.o                  \
 	$(BUILD_DIR)/asm/text_10_2.o                                  \
 	$(BUILD_DIR)/asm/text_11.o
 
diff --git a/src/darray.c b/src/GameSpy/darray.c
index b179f37..b179f37 100644
--- a/src/darray.c
+++ b/src/GameSpy/darray.c
diff --git a/src/hashtable.c b/src/GameSpy/hashtable.c
index d170aa7..d170aa7 100644
--- a/src/hashtable.c
+++ b/src/GameSpy/hashtable.c