diff -c ../../rescue-0_34-unix/firesimulator/AppTechFlammableBuilding.cxx ./AppTechFlammableBuilding.cxx
*** ../../rescue-0_34-unix/firesimulator/AppTechFlammableBuilding.cxx	Sun Dec 16 19:51:14 2001
--- ./AppTechFlammableBuilding.cxx	Tue Dec 18 21:07:25 2001
***************
*** 238,244 ****
  	}
  
  //	void AppTechFlammableBuilding::near(std::vector<AppTechFlammableBuilding*>& nrin)
! 	void AppTechFlammableBuilding::near(std::vector<rinsetu>& nrin)
  	{
  
  		Objects::const_iterator it = m_owner->objects().begin();
--- 238,244 ----
  	}
  
  //	void AppTechFlammableBuilding::near(std::vector<AppTechFlammableBuilding*>& nrin)
! 	void AppTechFlammableBuilding::nearby(std::vector<rinsetu>& nrin)
  	{
  
  		Objects::const_iterator it = m_owner->objects().begin();
***************
*** 352,358 ****
  	{
  		//std::vector<AppTechFlammableBuilding*> nrin;
  		std::vector<rinsetu> nrin;
! 		near(nrin);
  		pickup(nrin);
  	}
  
--- 352,358 ----
  	{
  		//std::vector<AppTechFlammableBuilding*> nrin;
  		std::vector<rinsetu> nrin;
! 		nearby(nrin);
  		pickup(nrin);
  	}
  
diff -c ../../rescue-0_34-unix/firesimulator/AppTechFlammableBuilding.hxx ./AppTechFlammableBuilding.hxx
*** ../../rescue-0_34-unix/firesimulator/AppTechFlammableBuilding.hxx	Sun Dec 16 19:51:14 2001
--- ./AppTechFlammableBuilding.hxx	Tue Dec 18 21:08:05 2001
***************
*** 164,170 ****
  //		void menseki_cal();
  		void kashi();
  
! 		void near(std::vector<rinsetu>& nrin);
  		void pickup(std::vector<rinsetu>& nrin);
  
  		void angle(rinsetu &);
--- 164,170 ----
  //		void menseki_cal();
  		void kashi();
  
! 		void nearby(std::vector<rinsetu>& nrin);
  		void pickup(std::vector<rinsetu>& nrin);
  
  		void angle(rinsetu &);
diff -c ../../rescue-0_34-unix/firesimulator/AppTechMkdat.cxx ./AppTechMkdat.cxx
*** ../../rescue-0_34-unix/firesimulator/AppTechMkdat.cxx	Sun Dec 16 19:51:15 2001
--- ./AppTechMkdat.cxx	Tue Dec 18 21:12:39 2001
***************
*** 61,67 ****
  	void AppTechFlammableBuilding::kashi()
  	{
  		std::vector<rinsetu> nrin;
! 		near(nrin);
  		pickup(nrin);
  	}
  
--- 61,67 ----
  	void AppTechFlammableBuilding::kashi()
  	{
  		std::vector<rinsetu> nrin;
! 		nearby(nrin);
  		pickup(nrin);
  	}
  
***************
*** 70,76 ****
  	!                       近い家屋を抽出する
  	!
  	!**********************************************************************/
! 	void AppTechFlammableBuilding::near(std::vector<rinsetu>& nrin)
  	{
  		Objects::const_iterator it_objects = m_owner->objects().begin();
  		for (; it_objects != m_owner->objects().end(); it_objects++) {
--- 70,76 ----
  	!                       近い家屋を抽出する
  	!
  	!**********************************************************************/
! 	void AppTechFlammableBuilding::nearby(std::vector<rinsetu>& nrin)
  	{
  		Objects::const_iterator it_objects = m_owner->objects().begin();
  		for (; it_objects != m_owner->objects().end(); it_objects++) {
diff -c ../../rescue-0_34-unix/firesimulator/Makefile ./Makefile
*** ../../rescue-0_34-unix/firesimulator/Makefile	Sun Dec 16 19:51:22 2001
--- ./Makefile	Tue Dec 18 21:02:52 2001
***************
*** 1,6 ****
  .SUFFIXES: .cxx $(SUFFIXES)
  
! TARGET		= firesimulator
  
  
  #FIRESRC		=RescueObjectPool.cxx FlammableBuilding.cxx
--- 1,7 ----
  .SUFFIXES: .cxx $(SUFFIXES)
  
! TARGET		= firesimulator.exe
! #TARGET		= firesimulator
  
  
  #FIRESRC		=RescueObjectPool.cxx FlammableBuilding.cxx
***************
*** 14,25 ****
  
  OBJS		= $(SRCS:.cxx=.o)
  
! CXX		= g++
  #COMPILEOPTIONS	= -pipe -O3 -DNDEBUG -Wall
  #COMPILEOPTIONS	= -pipe -O3 -DNDEBUG -Wall -DAPPTECH
  #COMPILEOPTIONS	= -pipe -O3 -g -Wall -DAPPTECH
  COMPILEOPTIONS	= -pipe -O3 -g -Wall -DAPPTECH -DTRAINNING -DMKDAT
! LINKOPTIONS	= -static -lm 
  #LINKOPTIONS	= -lm
   
  $(TARGET):	$(OBJS)
--- 15,28 ----
  
  OBJS		= $(SRCS:.cxx=.o)
  
! CXX           = i386-mingw32msvc-g++
! #CXX		= g++
  #COMPILEOPTIONS	= -pipe -O3 -DNDEBUG -Wall
  #COMPILEOPTIONS	= -pipe -O3 -DNDEBUG -Wall -DAPPTECH
  #COMPILEOPTIONS	= -pipe -O3 -g -Wall -DAPPTECH
  COMPILEOPTIONS	= -pipe -O3 -g -Wall -DAPPTECH -DTRAINNING -DMKDAT
! #LINKOPTIONS	= -static -lm 
! LINKOPTIONS   = -lm -lwsock32
  #LINKOPTIONS	= -lm
   
  $(TARGET):	$(OBJS)
diff -c ../../rescue-0_34-unix/firesimulator/common.hxx ./common.hxx
*** ../../rescue-0_34-unix/firesimulator/common.hxx	Sun Dec 16 19:51:18 2001
--- ./common.hxx	Tue Dec 18 21:10:22 2001
***************
*** 27,32 ****
--- 27,38 ----
  #	endif
  #endif
  
+ #ifdef __MINGW32__
+ #     ifndef OS_TYPE
+ #             define OS_TYPE OS_TYPE_WINDOWS
+ #     endif
+ #endif
+ 
  #ifndef OS_TYPE
  #	define OS_TYPE OS_TYPE_UNIX
  #endif
***************
*** 48,53 ****
--- 54,62 ----
  #include <limits.h>
  #include <stdio.h>
  #include <math.h>
+ #ifndef M_PI
+ # define M_PI 3.14159265358979323846    
+ #endif
  #include <time.h>
  
  #include <string>
***************
*** 68,74 ****
--- 77,85 ----
  #	endif
  #	include <winsock.h>
  #	include <conio.h>
+ #ifndef __MINGW32__
  #	include <typeinfo.h>
+ #endif
  	namespace Rescue {
  		inline void usleep(unsigned long microseconds) {
  			::Sleep(microseconds / 1000);