Window sizeを640x480から800x600にした

takeokunn · Nov 18, 2015 · f40005a · f40005a
1 parent 4653948
commit f40005a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/GitHub/Don't_push/Don't_push/source/continue.cpp b/GitHub/Don't_push/Don't_push/source/continue.cpp
@@ -10,9 +10,9 @@
 Status continu(const img_arr_t&, const sound_arr_t& sound) {
 	for (auto& s : sound) s.second.stop();//BGM全部停止
 	const auto Font_1 = CreateFontToHandle(NULL, 30, 1, DX_FONTTYPE_ANTIALIASING);//選択肢表示の文字
-	CONSTEXPR_OR_STATICCONST int select0_x = 200;	//文字の座標（左上）
+	CONSTEXPR_OR_STATICCONST int select0_x = 260;	//文字の座標（左上）
 	CONSTEXPR_OR_STATICCONST int select0_y = 150;
-	CONSTEXPR_OR_STATICCONST int select1_x = 200;
+	CONSTEXPR_OR_STATICCONST int select1_x = 260;
 	CONSTEXPR_OR_STATICCONST int select1_y = 250;
 
 	const std::array<unsigned int, 2>color = { GetColor(0,0,0), GetColor(255,255,255) };//選択している, 選択していない

diff --git a/GitHub/Don't_push/Don't_push/source/define.h b/GitHub/Don't_push/Don't_push/source/define.h
@@ -6,8 +6,8 @@
 #include <unordered_map>
 #include <string>
 #include <stdexcept>
-CONSTEXPR_OR_STATICCONST size_t WINDOW_WIDTH = 640;
-CONSTEXPR_OR_STATICCONST size_t WINDOW_HEIGHT = 480;
+CONSTEXPR_OR_STATICCONST size_t WINDOW_WIDTH = 800;
+CONSTEXPR_OR_STATICCONST size_t WINDOW_HEIGHT = 600;
 CONSTEXPR_OR_STATICCONST int FIRST_CHARA_X = WINDOW_WIDTH / 2;
 
 //状態管理

diff --git a/GitHub/Don't_push/Don't_push/source/end.cpp b/GitHub/Don't_push/Don't_push/source/end.cpp
@@ -17,8 +17,8 @@ Status end(const img_arr_t&, const sound_arr_t& sound) {
 	while ((is_normal_state = normal_con_f()) && state.update() && !state[KEY_INPUT_X] && !state.esc()) {
 		DrawBox(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT, GetColor(200, 200, 100), TRUE);	//背景
 
-		DrawStringToHandle(100, WINDOW_HEIGHT / 4, "やったぜ。", GetColor(250, 0, 0), Font_title);					//タイトル
-		DrawStringToHandle(180, WINDOW_HEIGHT - (WINDOW_HEIGHT / 3), "- Xキーを押してね -", GetColor(0, 0, 0), Font_1);//Xキー押してね
+		DrawStringToHandle(180, WINDOW_HEIGHT / 4, "やったぜ。", GetColor(250, 0, 0), Font_title);					//タイトル
+		DrawStringToHandle(260, WINDOW_HEIGHT - (WINDOW_HEIGHT / 3), "- Xキーを押してね -", GetColor(0, 0, 0), Font_1);//Xキー押してね
 	}
 	if (!is_normal_state) throw std::runtime_error("ProcessMessage() return -1.");
 	if (state.esc()) throw normal_exit();

diff --git a/GitHub/Don't_push/Don't_push/source/game.cpp b/GitHub/Don't_push/Don't_push/source/game.cpp
@@ -28,7 +28,7 @@ Status game_c::game_main(){
 	}
 	if (!is_normal_state) throw std::runtime_error("ProcessMessage() return -1.");
 	if (m_state_.esc()) throw normal_exit();
-	return Status::END;
+	return Status::CONTINUE;
 }
 #ifdef _MSC_VER
 #pragma warning (pop)

diff --git a/GitHub/Don't_push/Don't_push/source/title.cpp b/GitHub/Don't_push/Don't_push/source/title.cpp
@@ -19,9 +19,9 @@ Status title(const img_arr_t&, const sound_arr_t& sound) {
 	bool is_normal_state = true;
 	while (state.update() && !state[KEY_INPUT_Z] && !state.esc() && (is_normal_state = normal_con_f())) {
 		DrawBox(0, 0, WINDOW_WIDTH, WINDOW_HEIGHT, GetColor(100, 180, 250), TRUE);	//背景
-		DrawStringToHandle(30 + 5, WINDOW_HEIGHT / 3 + 5, "D...DON'T PUSH!!", GetColor(255, 255, 255), Font_title);		//タイトル（影）
-		DrawStringToHandle(30, WINDOW_HEIGHT / 3, "D...DON'T PUSH!!", GetColor(0, 0, 0), Font_title);					//タイトル
-		DrawStringToHandle(180, WINDOW_HEIGHT - (WINDOW_HEIGHT / 3), "- Zキーを押してね -", GetColor(0, 0, 0), Font_1); //Zキー押してね
+		DrawStringToHandle(100 + 5, WINDOW_HEIGHT / 3 + 5, "D...DON'T PUSH!!", GetColor(255, 255, 255), Font_title);		//タイトル（影）
+		DrawStringToHandle(100, WINDOW_HEIGHT / 3, "D...DON'T PUSH!!", GetColor(0, 0, 0), Font_title);					//タイトル
+		DrawStringToHandle(260, WINDOW_HEIGHT - (WINDOW_HEIGHT / 3), "- Zキーを押してね -", GetColor(0, 0, 0), Font_1); //Zキー押してね
 	}
 	if (!is_normal_state) throw std::runtime_error("ProcessMessage() return -1.");
 	sound.at("title").stop();